install libiconv in an unusual place, suggested by nico, otherwise other packages...

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

diff --git a/openwrt/package/libpng/Makefile b/openwrt/package/libpng/Makefile
index f7f6c9f..8033d42 100644 (file)
--- a/openwrt/package/libpng/Makefile
+++ b/openwrt/package/libpng/Makefile
@@ -12,6 +12,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-config.tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config

+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 


@@ -21,33 +22,60 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \

                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
                        --build=$(GNU_HOST_NAME) \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
                        --build=$(GNU_HOST_NAME) \

-                       --prefix=$(STAGING_DIR)/usr \
-                       --with-zlib=$(STAGING_DIR)/usr/ \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \

                        --enable-shared \
                        --enable-static \
                        --with-zlib=$(STAGING_DIR)/usr/ \
                        --enable-shared \
                        --enable-static \
                        --with-zlib=$(STAGING_DIR)/usr/ \

-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \

        )
        )

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

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

-       $(MAKE) -C $(PKG_BUILD_DIR) all
+       rm -rf $(PKG_INSTALL_DIR)
+       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

-       cp -fpR $(PKG_BUILD_DIR)/.libs/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/

        $(RSTRIP) $(IDIR_LIBPNG)
        $(IPKG_BUILD) $(IDIR_LIBPNG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built
        $(RSTRIP) $(IDIR_LIBPNG)
        $(IPKG_BUILD) $(IDIR_LIBPNG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built

-       $(MAKE) -C $(PKG_BUILD_DIR) all
+       mkdir -p $(STAGING_DIR)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/
+       mkdir -p $(STAGING_DIR)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config
+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/libpng.so
 
 
 install-dev: $(STAGING_DIR)/usr/lib/libpng.so
 


@@ -59,6 +87,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