Changeset 64e1977 in freewrt for package/rules.mk

Timestamp:

Jul 21, 2006, 9:19:44 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

ed3352a2

Parents:

0631111

Message:

GNU make and templates are limiting the use of variables,
so, after HOURS of trying AND reading the texinfo documentation,
I decided to give up and move the WRKDIR spec outside of the template,
thus possibly yielding improper results, but hey it seems to work
(at least for the zlib package, will test full build now)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@327 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/rules.mk (modified) (3 diffs)

package/rules.mk

@@ -2 +2 @@
 
 ifneq (${PKG_SOURCE_URL},)
-PKG_SOURCE?=    ${PKG_NAME}-${PKG_VERSION}.tar.gz
+ifeq (${PKG_SOURCE},)
+PKG_SOURCE:=    ${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
+endif
+ifneq (${PKG_SOURCE},)
 DISTFILES?=     ${DL_DIR}/${PKG_SOURCE}
+endif
 
-define PKG_template
-WRKDIR?=        ${BUILD_DIR}/w-$(2)_$(3)_$(4)
+WRKDIR?=        ${BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}
 WRKSRC?=        ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 WRKBUILD?=      ${WRKSRC}
 WRKINST?=       ${WRKDIR}/ipkg-install
+
+define PKG_template
 IPKG_$(1)=      $(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
 IDIR_$(1)=      $(WRKDIR)/ipkg/$(2)
@@ -29 +34 @@
 $$(IDIR_$(1))/CONTROL/control: $(WRKBUILD)/.prepared
         $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)
-        [ -n "$$(IDEPEND_$(1))" ] && echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control
+        [ -z "$$(IDEPEND_$(1))" ] || echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control
         for file in conffiles preinst postinst prerm postrm; do \
-                [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
+                [ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
         done
 
@@ -51 +56 @@
 endif
 
-ifneq (${DISTFILES},)
+ifneq (${DISTFILES}${PKG_SOURCE},)
 $(WRKBUILD)/.prepared: ${DISTFILES}
         rm -rf ${WRKSRC} ${WRKBUILD}