X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fjattach.git;a=blobdiff_plain;f=debian%2Fpatches%2Fdo-not-override-CFLAGS;fp=debian%2Fpatches%2Fdo-not-override-CFLAGS;h=fb07492be992757385260c26bd470aa2415920ec;hp=a5b351f40b6cc2fcf0739d163cfd6c9d9431e519;hb=5bb382184c752ce4e19664654562f48a5c473b97;hpb=c0070d73491e7466ff7f47939e2e4c2be2a926fb

diff --git a/debian/patches/do-not-override-CFLAGS b/debian/patches/do-not-override-CFLAGS
index a5b351f..fb07492 100644
--- a/debian/patches/do-not-override-CFLAGS
+++ b/debian/patches/do-not-override-CFLAGS
@@ -3,8 +3,10 @@ Description: do not override CFLAGS
  exported by dh.
 Author: Sven Hoexter <hoexter@debian.org>
 
---- jattach-1.5.orig/Makefile
-+++ jattach-1.5/Makefile
+Index: jattach/Makefile
+===================================================================
+--- jattach.orig/Makefile
++++ jattach/Makefile
 @@ -16,7 +16,6 @@ else
      SOURCES=$(RPM_ROOT)/SOURCES
      SPEC_FILE=jattach.spec
@@ -13,3 +15,12 @@ Author: Sven Hoexter <hoexter@debian.org>
      JATTACH_EXE=jattach
    endif
  endif
+@@ -27,7 +26,7 @@ build:
+ 	mkdir -p build
+ 
+ build/jattach: src/jattach_posix.c
+-	$(CC) $(CFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^
+ 
+ build/jattach.exe: src/jattach_windows.c
+ 	$(CL) $(CFLAGS) /DJATTACH_VERSION=\"$(JATTACH_VERSION)\" /Fobuild/jattach.obj /Fe$@ $^ advapi32.lib /link /SUBSYSTEM:CONSOLE,5.02