summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-06-09 01:57:56 +0000
committerChris Larson <clarson@kergoth.com>2004-06-09 01:57:56 +0000
commit5035161b45ae5c2b6a94132ba18c89bcd70cab43 (patch)
treea345994d13f9b7b8fe10abb74816c5c7646961be
parentc9e40663834352611ffd6f77a93da3f2a4e7c50a (diff)
Correct redundant hunks in the jpeg paths patch.
BKrev: 40c66ea4Vf6q5fu0lg_BNvvhiGgjDQ
-rw-r--r--jpeg/jpeg-6b/paths.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/jpeg/jpeg-6b/paths.patch b/jpeg/jpeg-6b/paths.patch
index 790e6a4382..014bf4ec0f 100644
--- a/jpeg/jpeg-6b/paths.patch
+++ b/jpeg/jpeg-6b/paths.patch
@@ -75,60 +75,3 @@
clean:
$(RM) *.o *.lo libjpeg.a libjpeg.la
---- jpeg-6b/Makefile~paths.patch
-+++ jpeg-6b/Makefile
-@@ -8,6 +8,7 @@
- # For compiling with source and object files in different directories.
- srcdir = /home/kergoth/code/build-arm/tmp/base/jpeg-6b-r0/jpeg-6b
- VPATH = /home/kergoth/code/build-arm/tmp/base/jpeg-6b-r0/jpeg-6b
-+DESTDIR = @DESTDIR@
-
- # Where to install the programs and man pages.
- prefix = /usr
-@@ -192,30 +193,30 @@
- # Installation rules:
-
- install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom install-lib
-- $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
-- $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
-- $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
-- $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
-- $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
-- $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
-- $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
-- $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
-- $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
-- $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
-+ $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
-+ $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
-+ $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
-+ $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
-+ $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
-+ $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
-
- install-lib: libjpeg.$(A) install-headers
-- $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
-+ $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
-
- install-headers: jconfig.h
-- $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
-- $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
-- $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
-- $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
-+ $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
-+ $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
-+ $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
-+ $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
- #<ballombe@debian.org>:mjpegtools require this file to build and header say:
- # * These declarations are considered internal to the JPEG library; most
- # * applications using the library shouldn't need to include this file.
- # So it is not forbidden to use it, therefore it must be installed.
-- $(INSTALL_DATA) $(srcdir)/jpegint.h $(includedir)/jpegint.h
-+ $(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
-
- clean:
- $(RM) *.o *.lo libjpeg.a libjpeg.la