restore old configure script patch; fix build error

[openwrt.git] / package / libpng / Makefile

diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 6fb1c18..f6541cb 100644 (file)
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -48,13 +48,15 @@ $(PKG_BUILD_DIR)/.configured:
                  --enable-static \
                  --with-zlib=$(STAGING_DIR)/usr/ \
        )
                  --enable-static \
                  --with-zlib=$(STAGING_DIR)/usr/ \
        )

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
 
 $(PKG_BUILD_DIR)/.built:

+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install

+       touch $@

 
 $(IPKG_LIBPNG):
        install -d -m0755 $(IDIR_LIBPNG)/usr/lib
 
 $(IPKG_LIBPNG):
        install -d -m0755 $(IDIR_LIBPNG)/usr/lib


@@ -83,6 +85,6 @@ uninstall-dev:
          $(STAGING_DIR)/usr/lib/libpng{,12}.{a,so*} \
          $(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
 
          $(STAGING_DIR)/usr/lib/libpng{,12}.{a,so*} \
          $(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev