view src/freeimage-1-no-shared.patch @ 1172:decfab988700

move the bugfix patch for package freeimage into a separate patch file
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 21 Sep 2010 11:46:33 +0200
parents 7b84a94a9df1
children
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	2010-04-29 11:16:50.000000000 +0200
+++ b/Makefile.gnu	2010-09-03 18:38:07.330351960 +0200
@@ -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,12 +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)
-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
-	ldconfig
+	install -m 644 $(HEADER) $(INCDIR)
+	install -m 644 $(STATICLIB) $(INSTALLDIR)
 
 clean:
 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)