diff options
| author | Eric Andersen <andersen@codepoet.org> | 2007-01-10 10:29:24 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2007-01-10 10:29:24 +0000 |
| commit | 2f984ec24fbb1260d46ed122b2a2e27452d18298 (patch) | |
| tree | 241c9fff0fe9bfce44bdf372a489d0a93e72038b /package/libpng | |
| parent | c130a87baae4a23cd53f9cd9bac5e7f754385c2a (diff) | |
fix install such that pkg-config setup is correct
Diffstat (limited to 'package/libpng')
| -rw-r--r-- | package/libpng/libpng.mk | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 4cf86d141..21ec6fb7d 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -50,7 +50,10 @@ $(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ + --prefix=$(STAGING_DIR) \ + --exec_prefix=$(STAGING_DIR) \ + --libdir=$(STAGING_DIR)/lib \ + --includedir=$(STAGING_DIR)/include \ --without-libpng-compat \ ); touch $(LIBPNG_DIR)/.configured @@ -60,11 +63,21 @@ $(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured touch $(LIBPNG_DIR)/.compiled $(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled - $(MAKE) \ - -C $(LIBPNG_DIR) \ - DESTDIR=$(STAGING_DIR) \ - prefix=/ \ - install + $(MAKE) prefix=$(STAGING_DIR) \ + exec_prefix=$(STAGING_DIR) \ + bindir=$(STAGING_DIR)/bin \ + sbindir=$(STAGING_DIR)/sbin \ + libexecdir=$(STAGING_DIR)/libexec \ + datadir=$(STAGING_DIR)/share \ + sysconfdir=$(STAGING_DIR)/etc \ + sharedstatedir=$(STAGING_DIR)/com \ + localstatedir=$(STAGING_DIR)/var \ + libdir=$(STAGING_DIR)/lib \ + includedir=$(STAGING_DIR)/include \ + oldincludedir=$(STAGING_DIR)/include \ + infodir=$(STAGING_DIR)/info \ + mandir=$(STAGING_DIR)/man \ + -C $(LIBPNG_DIR) install; touch -c $(STAGING_DIR)/lib/libpng.so $(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so |