diff options
author | Nicolas Thill <nico@openwrt.org> | 2005-09-06 21:16:40 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2005-09-06 21:16:40 +0000 |
commit | 4ce387cbb88c6c6ecd71cc73d02e4fbe9c5308c2 (patch) | |
tree | 5c71e33673f60259c60119c6c520b2e495e45754 /package/pcre/Makefile | |
parent | 0b15c5cf6e585f57b2f9b32a3a50737f78f75b00 (diff) | |
download | master-187ad058-4ce387cbb88c6c6ecd71cc73d02e4fbe9c5308c2.tar.gz master-187ad058-4ce387cbb88c6c6ecd71cc73d02e4fbe9c5308c2.tar.bz2 master-187ad058-4ce387cbb88c6c6ecd71cc73d02e4fbe9c5308c2.zip |
remove -L/usr/lib in pcre-config,
standardize Makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1864 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/pcre/Makefile')
-rw-r--r-- | package/pcre/Makefile | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 0172c28869..918ef4662d 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -22,31 +22,31 @@ $(PKG_BUILD_DIR)/.configured: (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) \ - --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 \ - --enable-utf8 \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --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 \ + --enable-utf8 \ ); touch $@ @@ -78,7 +78,7 @@ $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built 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 + touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpcre.so |