diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-05-19 21:15:46 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-05-19 21:15:46 +0000 |
| commit | 93e459ee932424a4f3767ee4543e4c41f8a651b5 (patch) | |
| tree | 3610338f98cb1bd198af07568a6e3cf1b75ea53e | |
| parent | 1c478a693df182a4104311629c4a90159fc31c1f (diff) | |
| download | upstream-93e459ee932424a4f3767ee4543e4c41f8a651b5.tar.gz upstream-93e459ee932424a4f3767ee4543e4c41f8a651b5.tar.bz2 upstream-93e459ee932424a4f3767ee4543e4c41f8a651b5.zip | |
Standardize lib package build and devel. install
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@969 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/pcre/Makefile | 38 | ||||
| -rw-r--r-- | package/popt/Makefile | 35 |
2 files changed, 41 insertions, 32 deletions
diff --git a/package/pcre/Makefile b/package/pcre/Makefile index c084f0089f..3697bedce5 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -42,15 +42,17 @@ $(PKG_BUILD_DIR)/.configured: --mandir=/usr/share/man \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ --enable-shared \ --enable-static \ --enable-utf8 \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C "$(PKG_BUILD_DIR)" \ CC_FOR_BUILD="$(HOSTCC)" \ LINK_FOR_BUILD="$(HOSTCC)" \ @@ -59,30 +61,32 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C "$(PKG_BUILD_DIR)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - all - touch $(PKG_BUILD_DIR)/.built - -$(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built - $(MAKE) -C "$(PKG_BUILD_DIR)" \ - DESTDIR="$(STAGING_DIR)" \ - install - rm -f $(STAGING_DIR)/usr/lib/libpcre*.la + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install + touch $@ $(IPKG_LIBPCRE): - mkdir -p $(IDIR_LIBPCRE)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/.libs/libpcre*.so.* $(IDIR_LIBPCRE)/usr/lib/ + install -d -m0755 $(IDIR_LIBPCRE)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCRE) $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR) +$(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/ + mkdir -p $(STAGING_DIR)/usr/include + cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ + touch $(STAGING_DIR)/usr/lib/libpcre.so + install-dev: $(STAGING_DIR)/usr/lib/libpcre.so uninstall-dev: rm -rf \ $(STAGING_DIR)/usr/bin/pcre-config \ - $(STAGING_DIR)/usr/include/pcre* \ - $(STAGING_DIR)/usr/lib/libpcre* \ - $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \ - $(STAGING_DIR)/usr/share/man/man*/pcre* \ + $(STAGING_DIR)/usr/include/pcre{,posix}.h \ + $(STAGING_DIR)/usr/lib/libpcre{,posix}.{a,so*} \ compile: install-dev clean: uninstall-dev diff --git a/package/popt/Makefile b/package/popt/Makefile index a30bdac39e..87cb45cff1 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -42,35 +42,40 @@ $(PKG_BUILD_DIR)/.configured: --mandir=/usr/share/man \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.built - -$(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ - install - rm -f $(STAGING_DIR)/usr/lib/libpopt.la + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install + touch $@ $(IPKG_LIBPOPT): - mkdir -p $(IDIR_LIBPOPT)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/.libs/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ + install -d -m0755 $(IDIR_LIBPOPT)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ $(RSTRIP) $(IDIR_LIBPOPT) $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR) +$(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/include + cp -fpR $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ + touch $(STAGING_DIR)/usr/lib/libpopt.so + install-dev: $(STAGING_DIR)/usr/lib/libpopt.so uninstall-dev: - -$(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ - uninstall + rm -rf \ + $(STAGING_DIR)/usr/include/popt.h \ + $(STAGING_DIR)/usr/lib/libpopt.{a,so*} \ compile: install-dev clean: uninstall-dev |