InstallDev should be using (1) and not (STAGING_DIR)

[packages.git] / utils / apr-util / Makefile

diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
index afd4033..4d2ce9c 100644 (file)
--- a/utils/apr-util/Makefile
+++ b/utils/apr-util/Makefile
@@ -25,15 +25,17 @@ include $(INCLUDE_DIR)/package.mk
 define Package/apr-util
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libiconv +libexpat +apr
+  DEPENDS:=+libiconv +libexpat +apr +libpthread +libopenssl +libsqlite3
   TITLE:=Apache Portable Runtime Library Util
   URL:=http://apr.apache.org/
 endef
 
 define Build/Configure 
        $(call Build/Configure/Default, \
+               --with-pgsql=no \
                --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
                --with-expat="$(STAGING_DIR)/usr" \
+               --without-sqlite2 \
                , \
                ac_cv_file_dbd_apr_dbd_mysql_c=no \
                APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
@@ -50,33 +52,28 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
+       mkdir -p $(1)/usr/bin
        $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-               $(STAGING_DIR)/usr/bin
-       mkdir -p $(STAGING_DIR)/usr/include/apr-1/
+               $(1)/usr/bin
+       mkdir -p $(1)/usr/include/apr-1/
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
-               $(STAGING_DIR)/usr/include/apr-1/
-       mkdir -p $(STAGING_DIR)/usr/lib 
+               $(1)/usr/include/apr-1/
+       mkdir -p $(1)/usr/lib 
                $(CP)   $(PKG_INSTALL_DIR)/usr/lib/*aprutil* \
-               $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
+               $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig/
                $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
-               $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config
-       $(SED)  "s,bindir\=\"/usr/bin\",bindir\=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apu-1-config
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-1.la
-       
+               $(1)/usr/lib/pkgconfig/
+       $(SED)  "s,\"/usr\",$(1)/usr," $(1)/usr/bin/apu-1-config
 endef
 
 define Build/UninstallDev
-       rm      $(STAGING_DIR)/usr/bin/apu-1-config \
-               $(STAGING_DIR)/usr/lib/{*aprutil-1*,aprutil.exp}
-       rm -rf  $(STAGING_DIR)/usr/include/apr-1
+       rm -rf  $(STAGING_DIR)/usr/bin/apu-1-config \
+               $(STAGING_DIR)/usr/lib/{*aprutil-1*,aprutil.exp} \
+               $(STAGING_DIR)/usr/include/apr-1
 endef
 
 define Package/apr-util/install        
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef