From b184532af0094c9d6d4b173cfeae0595503023a6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Aug 2005 12:57:29 +0000 Subject: [PATCH] fix linux-atm build SVN-Revision: 1723 --- openwrt/package/linux-atm/Makefile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile index 87746cf8c3..8b218daf59 100644 --- a/openwrt/package/linux-atm/Makefile +++ b/openwrt/package/linux-atm/Makefile @@ -28,8 +28,6 @@ $(PKG_BUILD_DIR)/.configured: automake; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -40,7 +38,7 @@ $(PKG_BUILD_DIR)/.configured: --exec-prefix=/usr \ --bindir=/usr/bin \ --datadir=/usr/share \ - --includedir=/usr/include/ \ + --includedir=/usr/include \ --infodir=/usr/share/info \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ @@ -60,29 +58,27 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_LINUX_ATM): - install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.so.* $(IDIR_LINUX_ATM)/usr/lib - install -d -m0755 $(IDIR_LINUX_ATM)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_LINUX_ATM)/usr/sbin/ + mkdir -p $(IDIR_LINUX_ATM)/usr/sbin + mkdir -p $(IDIR_LINUX_ATM)/lib + cp $(PKG_BUILD_DIR)/src/br2684/.libs/br2684ctl $(IDIR_LINUX_ATM)/usr/sbin/ + cp $(PKG_BUILD_DIR)/src/lib/.libs/libatm.1.0.0 $(IDIR_LINUX_ATM)/lib/libatm.1 $(RSTRIP) $(IDIR_LINUX_ATM)/ $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR) - -$(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built + +$(STAGING_DIR)/usr/lib/libatm.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm* $(STAGING_DIR)/usr/lib/ touch $@ -install-dev: $(STAGING_DIR)/usr/lib/libatm.so - +install-dev: $(STAGING_DIR)/usr/lib/libatm.a uninstall-dev: rm -rf \ - $(STAGING_DIR)/usr/include/atm{,d,sap}.h \ - $(STAGING_DIR)/usr/lib/libatm.{a,so*} \ + $(STAGING_DIR)/usr/include/atm*.h \ + $(STAGING_DIR)/usr/lib/libatm.* compile: install-dev - clean: uninstall-dev mostlyclean: