Mercurial > mxe-octave

view src/freeimage-1-no-shared.patch @ 762:a834626f7a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7b84a94a9df1
line wrap: on
line source

This file is part of mingw-cross-env.
See doc/index.html for further information.

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++
 
@@ -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 $@
@@ -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)
# Linux makefile for FreeImage