Only masquerade LAN, other settings need manual tweaking

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 0d74c0d..1df4537 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -15,34 +15,37 @@ $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
 $(curdir)/builddirs-install:=. $(sort $(package-y))
 
 $(curdir)/install:=$(curdir)/install-cleanup
 $(curdir)/builddirs-install:=. $(sort $(package-y))
 
 $(curdir)/install:=$(curdir)/install-cleanup

-$(curdir)/install-cleanup:
-       rm -rf $(BUILD_DIR)/root
-       $(MAKE) install-targets
-       $(MAKE) preconfig
+
+$(curdir)/cleanup: $(TMP_DIR)/.build
+       rm -rf $(TARGET_DIR)
+
+$(curdir)/rootfs-prepare: $(TMP_DIR)/.build
+       @-$(MAKE) package/preconfig

        @if [ -d $(TOPDIR)/files ]; then \
        @if [ -d $(TOPDIR)/files ]; then \

-               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+               $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \

        fi
        fi

-       @mkdir -p $(BUILD_DIR)/root/etc/rc.d
+       @mkdir -p $(TARGET_DIR)/etc/rc.d

        @( \
        @( \

-               cd $(BUILD_DIR)/root; \
+               cd $(TARGET_DIR); \

                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \

-                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+                       IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \

                done || true \
        )
                done || true \
        )

-       @-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
-       @-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
-       @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
+       @-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
+       @-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
+       @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
+       $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/ipkg)

 
 $(curdir)/index: FORCE
 
 $(curdir)/index: FORCE

-       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)

 
 $(curdir)/flags-install:= -j1
 
 
 $(curdir)/flags-install:= -j1
 

-$(eval $(call stampfile,$(curdir),package,prereq))
-$(eval $(call stampfile,$(curdir),package,compile))
-$(eval $(call stampfile,$(curdir),package,install))
-
-$($(curdir)/stamp-install): $($(curdir)/stamp-compile)
+$(eval $(call stampfile,$(curdir),package,prereq,.config))
+$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build))

 
 $(eval $(call subdir,$(curdir)))
 
 $(eval $(call subdir,$(curdir)))