Changeset 358fc4de in freewrt

Timestamp:

Dec 18, 2006, 11:01:35 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

bee3901

Parents:

a9d1ee4

Message:

• fix CONFIGURE_STYLE
• make BUILD_STYLE=auto equivalent to till-now empty
• introduce concept of INSTALL_STYLE

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1335 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/pkg-bottom.mk (modified) (4 diffs)
• package/openvpn/Makefile (modified) (1 diff)

mk/pkg-bottom.mk

@@ -10 +10 @@
 ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
         @${MAKE} pre-configure
-ifeq ($(filter gnu,${CONFIGURE_STYLE}))
+ifeq ($(filter gnu,${CONFIGURE_STYLE}),)
         cd ${WRKBUILD}; rm -f config.{cache,status}; \
             ${TARGET_CONFIGURE_OPTS} \
@@ -30 +30 @@
             --disable-nls \
             ${CONFIGURE_ARGS}
-else ifeq ($(filter-out manual,${CONFIGURE_STYLE}))
+else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
         ${MAKE} do-configure
 else
@@ -44 +44 @@
 MAKE_FILE?=             Makefile
 ALL_TARGET?=            all
+INSTALL_TARGET?=        install
 ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
         @${MAKE} pre-build
 ifeq (${BUILD_STYLE},manual)
         ${MAKE} do-build
-else ifeq (${BUILD_STYLE},)
+else ifeq ($(filter-out auto,${BUILD_STYLE}),)
         cd ${WRKBUILD} && ${MAKE} -f ${MAKE_FILE} ${ALL_TARGET}
 else
@@ -60 +61 @@
 ${_FAKE_COOKIE}: ${_BUILD_COOKIE} _control-files
         @${MAKE} pre-install
+ifeq (${INSTALL_STYLE},auto)
+        cd ${WRKBUILD} && ${MAKE} -f ${MAKE_FILE} \
+            DESTDIR='${WRKINST}' ${INSTALL_TARGET}
+else ifeq ($(filter-out manual,${INSTALL_STYLE}),)
         ${MAKE} do-install
+else
+        @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
+        @exit 1
+endif
         @${MAKE} post-install
         touch $@

package/openvpn/Makefile

@@ -67 +67 @@
                         $(ENABLE_PASSWORD_SAVE) \
                         $(ENABLE_SMALL)
+INSTALL_STYLE=          auto
 
-pre-install:
-        $(MAKE) -C $(WRKBUILD) \
-                DESTDIR="$(WRKINST)" \
-                install
-
-do-install:
+post-install:
         # main package
         install -d -m0755 $(IDIR_OPENVPN)/usr/sbin