diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-08-01 01:36:16 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-08-01 01:36:16 +0000 |
| commit | 81ed13cf894dfe1ed66fd5940c0be512586f6e15 (patch) | |
| tree | 859cc276f2742e269263759f8c5436268d39b9ca /obsolete-buildroot/make/pppoecd.mk | |
| parent | 2106b3258b7ca028dce432da0673a8a6607b9f03 (diff) | |
clean up yesterday's reorganization
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'obsolete-buildroot/make/pppoecd.mk')
| -rw-r--r-- | obsolete-buildroot/make/pppoecd.mk | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/obsolete-buildroot/make/pppoecd.mk b/obsolete-buildroot/make/pppoecd.mk index 48ebbb8a36..3e7c2b319d 100644 --- a/obsolete-buildroot/make/pppoecd.mk +++ b/obsolete-buildroot/make/pppoecd.mk @@ -6,57 +6,56 @@ # .patched-pppoecd in the pppd directory. PPPD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppd -PPPD_PATCH=$(SOURCE_DIR)/pppoecd-pathnames.patch +PPPD_PATCH_DIR=$(OPENWRT_IPK_DIR)/pppoecd PPPOECD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppoecd -PPPOECD_PATCH=$(SOURCE_DIR)/pppoecd.patch -PPPOECD_BIN=$(TARGET_DIR)/sbin/pppoecd - -PPPOECD_IPK_DIR=$(BUILD_DIR)/pppoecd-1.0 +PPPOECD_IPK_DIR=$(OPENWRT_IPK_DIR)/pppoecd +PPPOECD_IPK_BUILD_DIR=$(BUILD_DIR)/pppoecd-1.0 PPPOECD_PACKAGE=$(BUILD_DIR)/pppoecd_1.0_mipsel.ipk -PPPOECD_IPK_BIN=$(PPPOECD_IPK_DIR)/sbin/pppoecd +PPPOECD_BIN=$(TARGET_DIR)/sbin/pppoecd +PPPOECD_IPK_BIN=$(PPPOECD_IPK_BUILD_DIR)/sbin/pppoecd # patch pppd for the openwrt compatible path names $(PPPD_DIR)/.patched-pppoecd: $(BUILD_DIR)/WRT54GS/.source - cat $(PPPD_PATCH) | patch -d $(PPPD_DIR) + cat $(PPPD_PATCH_DIR)/pppoecd-pathnames.patch | patch -d $(PPPD_DIR) touch $(PPPD_DIR)/.patched-pppoecd # patch the pppoecd itself for GCC3.x compatibility and to move pppoecd to /sbin $(PPPOECD_DIR)/.patched: $(PPPD_DIR)/.patched-pppoecd - cat $(PPPOECD_PATCH) | patch -d $(PPPOECD_DIR) + cat $(PPPOECD_IPK_DIR)/pppoecd.patch | patch -d $(PPPOECD_DIR) touch $(PPPOECD_DIR)/.patched # build the pppoecd binary for the ipk version $(PPPOECD_IPK_BIN): $(PPPOECD_DIR)/.patched - mkdir -p $(PPPOECD_IPK_DIR)/etc/ppp - cp $(SOURCE_DIR)/pppoecd.ip-up $(PPPOECD_IPK_DIR)/etc/ppp/ip-up - chmod a+x $(PPPOECD_IPK_DIR)/etc/ppp/ip-up + mkdir -p $(PPPOECD_IPK_BUILD_DIR)/etc/ppp + cp $(PPPOECD_IPK_DIR)/root/etc/ppp/ip-up $(PPPOECD_IPK_BUILD_DIR)/etc/ppp/ip-up + chmod a+x $(PPPOECD_IPK_BUILD_DIR)/etc/ppp/ip-up $(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ - SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(PPPOECD_IPK_DIR) LIBDIR=$(UCLIBC_DIR)/lib \ + SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(PPPOECD_IPK_BUILD_DIR) LIBDIR=$(UCLIBC_DIR)/lib \ STRIP="$(STRIP)" \ install # setup ipkg control files -$(PPPOECD_IPK_DIR)/CONTROL/control: - mkdir -p $(PPPOECD_IPK_DIR)/CONTROL - cp $(SOURCE_DIR)/pppoecd.prerm $(PPPOECD_IPK_DIR)/CONTROL/prerm - chmod a+x $(PPPOECD_IPK_DIR)/CONTROL/prerm - cp $(SOURCE_DIR)/pppoecd.postrm $(PPPOECD_IPK_DIR)/CONTROL/postrm - chmod a+x $(PPPOECD_IPK_DIR)/CONTROL/postrm - cp $(SOURCE_DIR)/pppoecd.conffiles $(PPPOECD_IPK_DIR)/CONTROL/conffiles - cp $(SOURCE_DIR)/pppoecd.control $(PPPOECD_IPK_DIR)/CONTROL/control +$(PPPOECD_IPK_BUILD_DIR)/CONTROL/control: + mkdir -p $(PPPOECD_IPK_BUILD_DIR)/CONTROL + cp $(PPPOECD_IPK_DIR)/CONTROL/prerm $(PPPOECD_IPK_BUILD_DIR)/CONTROL/prerm + chmod a+x $(PPPOECD_IPK_BUILD_DIR)/CONTROL/prerm + cp $(PPPOECD_IPK_DIR)/CONTROL/postrm $(PPPOECD_IPK_BUILD_DIR)/CONTROL/postrm + chmod a+x $(PPPOECD_IPK_BUILD_DIR)/CONTROL/postrm + cp $(PPPOECD_IPK_DIR)/CONTROL/conffiles $(PPPOECD_IPK_BUILD_DIR)/CONTROL/conffiles + cp $(PPPOECD_IPK_DIR)/CONTROL/control $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control # build the ipk package -$(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_DIR)/CONTROL/control - cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root pppoecd-1.0 +$(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control + cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(PPPOECD_IPK_BUILD_DIR) # main target for building the ipk version pppoecd-ipk: $(PPPOECD_PACKAGE) # the embedded binary $(PPPOECD_BIN): $(PPPOECD_DIR)/.patched - mkdir $(TARGET_DIR)/etc/ppp - cp $(SOURCE_DIR)/pppoecd.ip-up $(TARGET_DIR)/etc/ppp/ip-up + mkdir -p $(TARGET_DIR)/etc/ppp + cp $(PPPOECD_IPK_DIR)/root/etc/ppp/ip-up $(TARGET_DIR)/etc/ppp/ip-up chmod a+x $(TARGET_DIR)/etc/ppp/ip-up $(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(TARGET_DIR) LIBDIR=$(UCLIBC_DIR)/lib \ @@ -69,5 +68,5 @@ pppoecd: $(PPPOECD_BIN) pppoecd-clean: -$(MAKE) -C $(PPPOECD_DIR) clean rm -f $(TARGET_DIR)/usr/sbin/pppoecd - rm -rf $(PPPOECD_IPK_DIR) + rm -rf $(PPPOECD_IPK_BUILD_DIR) rm -f $(PPPOECD_PACKAGE) |