- up for 4.22

Changed files:
    di-Makefile.patch -> 1.4

diff --git a/di-Makefile.patch b/di-Makefile.patch
index d7f139c377b837e7ad6d98e022affa40ca986034..779065c173418ea4167934cd8e49269539e79ce3 100644 (file)
--- a/di-Makefile.patch
+++ b/di-Makefile.patch
@@ -1,8 +1,11 @@
---- di-4.20/Makefile~  2010-03-31 17:30:14.000000000 +0200
-+++ di-4.20/Makefile   2010-04-02 16:24:55.767775880 +0200
-@@ -138,7 +138,7 @@
+--- di-4.22/Makefile~  2010-05-06 06:50:33.000000000 +0200
++++ di-4.22/Makefile   2010-05-06 12:22:40.266987097 +0200
+@@ -136,9 +136,9 @@
+       $(CP) -f config.win config.h
+       $(MAKE) \
                CC=cl LD=cl EXE_EXT=".exe" OBJ_EXT=".obj" \
-               CFLAGS="$(CFLAGS) -nologo -O2 \
+-              CFLAGS="$(CFLAGS) -nologo -O2 \
++              CFLAGS="$(CFLAGS) $(OPTFLAGS) -nologo" \
                -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \
 -              LDFLAGS="-nologo -O2" di-programs
 +              LDFLAGS="-nologo" di-programs
@@ -19,18 +22,3 @@
  
  os2-gcc:
        @echo ':' > di.env;chmod a+rx di.env
-@@ -279,12 +278,12 @@
-       @if [ -f reqlibs.txt ];then \
-               echo "*** Using libs: `$(CAT) reqlibs.txt`"; fi
-       $(CC) -o $(PROG)$(EXE_EXT) \
--              $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) \
-+              $(CFLAGS) $(OPTFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) \
-               `if [ -f reqlibs.txt ];then $(CAT) reqlibs.txt; fi`
- 
- hasnls$(EXE_EXT):     hasnls$(OBJ_EXT)
-       $(CC) -o hasnls$(EXE_EXT) \
--              $(CFLAGS) $(LDFLAGS) \
-+              $(CFLAGS) $(OPTFLAGS) $(LDFLAGS) \
-               hasnls$(OBJ_EXT)
- 
- ###