changed cp for $(CP), reverted wrong package/config/Makefile CP

[openwrt.git] / openwrt / package / libdb / Makefile

diff --git a/openwrt/package/libdb/Makefile b/openwrt/package/libdb/Makefile
index a6da8d8..d2ecf93 100644 (file)
--- a/openwrt/package/libdb/Makefile
+++ b/openwrt/package/libdb/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBDB,libdb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR)/build_unix ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --disable-java \
                --enable-cxx \
                --disable-posixmutexes \
-               --enable-uimutexes \
+               --disable-uimutexes \
                --disable-tcl \
                --disable-rpc \
                --enable-compat185 \
@@ -61,24 +61,24 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
                DESTDIR="$(PKG_INSTALL_DIR)" install
        touch $@
 
-$(IPKG_LIBDB): $(STAGING_DIR)/usr/lib/libdb.so
+$(IPKG_LIBDB): 
        install -m0755 -d $(IDIR_LIBDB)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/
        $(RSTRIP) $(IDIR_LIBDB)
        $(IPKG_BUILD) $(IDIR_LIBDB) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libdb.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/
        touch $(STAGING_DIR)/usr/lib/libdb.so
 
 install-dev: $(STAGING_DIR)/usr/lib/libdb.so
@@ -87,5 +87,5 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/db.h
        rm -rf $(STAGING_DIR)/usr/lib/libdb*.{a,so}
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev