Fix freeimage.002 patch (crlf to lf)

diff --git a/config/patches/freeimage.002_build_procedure.patch b/config/patches/freeimage.002_build_procedure.patch
index bcbaad3cd02f9a0f3ab5938fc448cd7cc8a3f163..cab1319cd8f7315e2ede70987a471ad0f907e471 100644 (file)
--- a/config/patches/freeimage.002_build_procedure.patch
+++ b/config/patches/freeimage.002_build_procedure.patch
@@ -2,61 +2,61 @@ diff -NaurwB freeimage-3.16.0__0/Makefile.fip freeimage-3.16.0__1/Makefile.fip
 --- freeimage-3.16.0__0/Makefile.fip   2014-03-15 19:35:28.000000000 +0400
 +++ freeimage-3.16.0__1/Makefile.fip   2017-03-15 15:05:20.396869687 +0300
 @@ -4,9 +4,9 @@
- include fipMakefile.srcs\r
- \r
- # General configuration variables:\r
--DESTDIR ?= /\r
--INCDIR ?= $(DESTDIR)/usr/include\r
--INSTALLDIR ?= $(DESTDIR)/usr/lib\r
-+DESTDIR ?= /usr\r
-+INCDIR ?= $(DESTDIR)/include\r
-+INSTALLDIR ?= $(DESTDIR)/lib\r
- \r
- # Converts cr/lf to just lf\r
- DOS2UNIX = dos2unix\r
+ include fipMakefile.srcs
+ 
+ # General configuration variables:
+-DESTDIR ?= /
+-INCDIR ?= $(DESTDIR)/usr/include
+-INSTALLDIR ?= $(DESTDIR)/usr/lib
++DESTDIR ?= /usr
++INCDIR ?= $(DESTDIR)/include
++INSTALLDIR ?= $(DESTDIR)/lib
+ 
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
 @@ -71,10 +71,12 @@
- \r
- install:\r
-       install -d $(INCDIR) $(INSTALLDIR)\r
--      install -m 644 -o root -g root $(HEADER) $(INCDIR)\r
--      install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)\r
--      install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)\r
--      install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)\r
-+      install -m 644 $(HEADER) $(INCDIR)\r
-+      install -m 644 $(HEADERFIP) $(INCDIR)\r
-+      install -m 644 $(STATICLIB) $(INSTALLDIR)\r
+ 
+ install:
+       install -d $(INCDIR) $(INSTALLDIR)
+-      install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-      install -m 644 -o root -g root $(HEADERFIP) $(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 $(HEADERFIP) $(INCDIR)
++      install -m 644 $(STATICLIB) $(INSTALLDIR)
 +      install -m 755 $(SHAREDLIB) $(INSTALLDIR)
 +      ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-+      ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)\r
- \r
- clean:\r
-       rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)\r
++      ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ 
+ clean:
+       rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
 diff -NaurwB freeimage-3.16.0__0/Makefile.gnu freeimage-3.16.0__1/Makefile.gnu
 --- freeimage-3.16.0__0/Makefile.gnu   2014-03-16 00:02:08.000000000 +0400
 +++ freeimage-3.16.0__1/Makefile.gnu   2017-03-15 15:05:20.384869623 +0300
 @@ -4,9 +4,9 @@
- include Makefile.srcs\r
- \r
- # General configuration variables:\r
--DESTDIR ?= /\r
--INCDIR ?= $(DESTDIR)/usr/include\r
--INSTALLDIR ?= $(DESTDIR)/usr/lib\r
-+DESTDIR ?= /usr\r
-+INCDIR ?= $(DESTDIR)/include\r
-+INSTALLDIR ?= $(DESTDIR)/lib\r
- \r
- # Converts cr/lf to just lf\r
- DOS2UNIX = dos2unix\r
+ include Makefile.srcs
+ 
+ # General configuration variables:
+-DESTDIR ?= /
+-INCDIR ?= $(DESTDIR)/usr/include
+-INSTALLDIR ?= $(DESTDIR)/usr/lib
++DESTDIR ?= /usr
++INCDIR ?= $(DESTDIR)/include
++INSTALLDIR ?= $(DESTDIR)/lib
+ 
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
 @@ -70,9 +70,9 @@
- \r
- install:\r
-       install -d $(INCDIR) $(INSTALLDIR)\r
--      install -m 644 -o root -g root $(HEADER) $(INCDIR)\r
--      install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)\r
--      install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)\r
-+      install -m 644 $(HEADER) $(INCDIR)\r
-+      install -m 644 $(STATICLIB) $(INSTALLDIR)\r
-+      install -m 755 $(SHAREDLIB) $(INSTALLDIR)\r
-       ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)\r
-       ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)   \r
- #     ldconfig\r
+ 
+ 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)
++      install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+       ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+       ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)   
+ #     ldconfig