Ticket #44526: patch-Makefiles.diff

src/Makefile.bootstrap

@@ -6 +6 @@
 
 # Rule to generate the qmake Makefile for building xxdiff.
 QMAKE ?= /usr/bin/qmake-qt4
+MAKEDIR ?= .
 
 all: Makefile
 
@@ -15 +16 @@
     export QMAKESPEC=macx-g++
 endif
 
-Makefile.qmake: xxdiff.pro
+Makefile.qmake: $(MAKEDIR)/xxdiff.pro
         $(QMAKE) -o Makefile.qmake $<
 
-Makefile: Makefile.qmake Makefile.extra
-        cat $^ > Makefile
+Makefile: Makefile.qmake $(MAKEDIR)/Makefile.extra
+        echo "MAKEDIR = $(MAKEDIR)" > Makefile
+        cat $^ >> Makefile
 

src/Makefile.extra

@@ -4 +4 @@
 #
 
 # Extra targets.
-EXTRA_FILES = version.h doc.h
+EXTRA_FILES = version.h $(MAKEDIR)/doc.h
 
 .SUFFIXES: .html .txt .h
 
@@ -23 +23 @@
 #
 
 # Automatically generate a simple include file with version number in it.
-version.h: ../VERSION
-        echo "#define XX_VERSION \"`cat ../VERSION`\"" > $@
+version.h: $(MAKEDIR)/../VERSION
+        echo "#define XX_VERSION \"`cat $(MAKEDIR)/../VERSION`\"" > $@
 
 # Dependencies for the generated version file.
 proginfo.o: version.h
@@ -41 +41 @@
         sed -e 's/\"/\\\"/g;s/$$/\\n\\/;1s/^/char text[]=\"/;$$s/\\$$/\"\;/' $< > $@
 
 # Dependencies for the generated documentation file.
-help.o: doc.h
-help.obj: doc.h
+help.o: $(MAKEDIR)/doc.h
+help.obj: $(MAKEDIR)/doc.h
 
 # Convert the reStructuredText documentation to html.  (this is only used by the
 # author, directly, manually, not that important for xxdiff packagers.)
-.txt.html:
-        rst2html.py --output-encoding=iso-8859-1 $< $@
+#.txt.html:
+#       rst2html.py --output-encoding=iso-8859-1 $< $@
 
 #
 # clean_extra
@@ -60 +60 @@
         rm -f $(EXTRA_FILES)
 
 
-# Override the qmake we use because the one in the path might be different.
-QMAKE = $(QTDIR)/bin/qmake
-
 
 # Note: we would need to add this to be correct.  Danger!  If the Makefile gets
 # remade, this file does not get appended again to the new makefile!
 all: Makefile
 
-Makefile: xxdiff.pro
-        $(MAKE) -f Makefile.bootstrap Makefile
+Makefile: $(MAKEDIR)/xxdiff.pro
+        $(MAKE) -f $(MAKEDIR)/Makefile.bootstrap Makefile