diff options
| author | John Voltz <john.voltz@gmail.com> | 2008-03-06 18:14:14 +0000 |
|---|---|---|
| committer | John Voltz <john.voltz@gmail.com> | 2008-03-06 18:14:14 +0000 |
| commit | a53d48a7b98b100919c444e7eb824ba1696380c8 (patch) | |
| tree | 5f119fa7e89fa68216ca9b005e37bb8f753b5576 | |
| parent | 808dd830257dd584d5245b4e8ca521c737b1cbdf (diff) | |
| download | buildroot-novena-a53d48a7b98b100919c444e7eb824ba1696380c8.tar.gz buildroot-novena-a53d48a7b98b100919c444e7eb824ba1696380c8.zip | |
fixed jpeg makefile
| -rw-r--r-- | package/jpeg/jpeg.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 3ba872074..9786ac0be 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -49,7 +49,7 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked --exec-prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ - --libdir=/lib \ + --libdir=/usr/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ @@ -67,14 +67,15 @@ $(JPEG_DIR)/.libs/libjpeg.a: $(JPEG_DIR)/.configured $(MAKE) -C $(JPEG_DIR) all touch -c $@ -$(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install-headers install-lib - rm $(STAGING_DIR)/lib/libjpeg.la +$(STAGING_DIR)/usr/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install + cp -f $(JPEG_DIR)/libjpeg.la $(STAGING_DIR)/usr/lib + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libjpeg.la touch -c $@ -$(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a +$(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/usr/lib/libjpeg.a mkdir -p $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so* touch -c $@ |