Mercurial > mxe-octave
changeset 762:a834626f7a0f
add missing CR characters to the patch of package freeimage
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Tue, 16 Feb 2010 21:23:19 +0100 |
| parents | a15ef607412d |
| children | 0083728da7ee |
| files | src/freeimage-1-no-shared.patch |
| diffstat | 1 files changed, 34 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freeimage-1-no-shared.patch Tue Feb 16 12:22:34 2010 +0100 +++ b/src/freeimage-1-no-shared.patch Tue Feb 16 21:23:19 2010 +0100 @@ -5,38 +5,39 @@ --- a/Makefile.gnu 2009-07-28 06:35:26.000000000 +0200 +++ b/Makefile.gnu 2010-02-16 11:50:50.509897756 +0100 @@ -9,7 +9,7 @@ - INSTALLDIR ?= $(DESTDIR)/usr/lib - - # Converts cr/lf to just lf --DOS2UNIX = dos2unix -+DOS2UNIX = echo 'dos2unix not needed ' - - LIBRARIES = -lstdc++ - + INSTALLDIR ?= $(DESTDIR)/usr/lib + + # Converts cr/lf to just lf +-DOS2UNIX = dos2unix ++DOS2UNIX = echo 'dos2unix not needed ' + + LIBRARIES = -lstdc++ + @@ -40,13 +40,12 @@ - - dist: FreeImage - cp *.a Dist -- cp *.so Dist - cp Source/FreeImage.h Dist - - dos2unix: - @$(DOS2UNIX) $(SRCS) $(INCLS) - --FreeImage: $(STATICLIB) $(SHAREDLIB) -+FreeImage: $(STATICLIB) - - .c.o: - $(CC) $(CFLAGS) -c $< -o $@ + + dist: FreeImage + cp *.a Dist +- cp *.so Dist + cp Source/FreeImage.h Dist + + dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +-FreeImage: $(STATICLIB) $(SHAREDLIB) ++FreeImage: $(STATICLIB) + + .c.o: + $(CC) $(CFLAGS) -c $< -o $@ @@ -62,9 +61,8 @@ - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) - - clean: - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) +# Linux makefile for FreeImage