diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-02-16 20:23:19 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-02-16 20:23:19 (GMT) |
| commit | 91464c9a5b3827019516828d3704295cb0065d04 (patch) | |
| tree | fb256feec31906bc5bd5c7eee0e6de181b6bb2ec /src/freeimage-1-no-shared.patch | |
| parent | 456d5a9d685e5d82c814ad76ebe6064fae75cd83 (diff) | |
| download | mxe-91464c9a5b3827019516828d3704295cb0065d04.zip mxe-91464c9a5b3827019516828d3704295cb0065d04.tar.gz mxe-91464c9a5b3827019516828d3704295cb0065d04.tar.bz2 | |
add missing CR characters to the patch of package freeimage
Diffstat (limited to 'src/freeimage-1-no-shared.patch')
| -rw-r--r-- | src/freeimage-1-no-shared.patch | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/src/freeimage-1-no-shared.patch b/src/freeimage-1-no-shared.patch index 851cbc6..8b4d665 100644 --- a/src/freeimage-1-no-shared.patch +++ b/src/freeimage-1-no-shared.patch @@ -5,38 +5,39 @@ diff -urN a/Makefile.gnu b/Makefile.gnu --- 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
|