Ticket #41320: patch-Makefile.diff

Makefile

@@ -17 +17 @@
 # some varibales ...
 
 all: tcl tk mesa fftw meschach xcrysden 
-xcrysden: usage bwidget bindir src-C src-F src-Tcl
+xcrysden: usage bindir src-C src-F src-Tcl
+#xcrysden: usage bwidget bindir src-C src-F src-Tcl
 
 usage: $(TOPDIR)/docs/xcrysden.1
         man $(TOPDIR)/docs/xcrysden.1 | awk 'BEGIN {lprint=0; print "## do not edit changes will be lost (file automatically generated)\n"; } /SYNOPSIS/ { lprint=1; } /SEE ALSO/ { lprint=0; } /a*/ { if (lprint) print; }' > usage
@@ -202 +203 @@
         system/ \
 
 EXTERNAL_SRC_FILES    = external/Makefile external/src/Makefile
-EXTERNAL_LIB_BWIDGET  = external/lib/bwidget-$(BWIDGET_VER)
+#EXTERNAL_LIB_BWIDGET  = external/lib/bwidget-$(BWIDGET_VER)
 EXTERNAL_LIB_TCLTK    = external/lib/tcl$(TCL_VER2) external/lib/tk$(TCL_VER2)
 
 EXTERNAL_SHAREDLIB_FILES = $(wildcard \
@@ -230 +231 @@
 version  := $(shell cat version)
 xcrysden  = xcrysden-$(version)
 
+dprefix=$(DESTDIR)/$(prefix)
+
 install: xcrysden
         @echo
         @echo "#-----"
@@ -238 +241 @@
         @echo "#                          "
         @echo "#-----"
         @echo   
-        install -m755 -d $(prefix)/share/$(xcrysden)
-        cp -a $(IRON_ITEMS) $(prefix)/share/$(xcrysden)
+        install -m755 -d $(dprefix)/share/$(xcrysden)
+        cp -a $(IRON_ITEMS) $(dprefix)/share/$(xcrysden)
         \
-        for subdir in Awk examples $(EXTERNAL_LIB_BWIDGET) images scripts Tcl util; do \
+        for subdir in Awk examples $(EXTERNAL_LIB_BWIDGET) images scripts Tcl util tests; do \
                 if test -d $$subdir; then \
-                        install -m755 -d $(prefix)/share/$(xcrysden)/$$subdir; \
-                        cp -a   $$subdir/* $(prefix)/share/$(xcrysden)/$$subdir; \
+                        install -m755 -d $(dprefix)/share/$(xcrysden)/$$subdir; \
+                        cp -a   $$subdir/* $(dprefix)/share/$(xcrysden)/$$subdir; \
                 fi; \
         done
         \
-        install -m755 -d $(prefix)/share/man/man1
-        install -m644 $(MAN_FILES) $(prefix)/share/man/man1/
-        gzip -f $(addprefix $(prefix)/share/man/man1/,$(MAN_PAGES))
+        install -m755 -d $(dprefix)/share/man/man1
+        install -m644 $(MAN_FILES) $(dprefix)/share/man/man1/
+        gzip -f $(adddprefix $(dprefix)/share/man/man1/,$(MAN_PAGES))
         \
-        install -m755 -d $(prefix)/lib/$(xcrysden)
-        install -m755 bin/*  $(prefix)/lib/$(xcrysden)/
+        install -m755 -d $(dprefix)/lib/$(xcrysden)
+        install -m755 bin/*  $(dprefix)/lib/$(xcrysden)/
         \
         prefix=$(prefix) xcrysden=$(xcrysden) sh sys_utils/wrappers.sh
-        if test ! -d $(prefix)/bin; then install -m755 -d $(prefix)/bin; fi
+        if test ! -d $(dprefix)/bin; then install -m755 -d $(dprefix)/bin; fi
         for prog in $(PROGS); do \
-                install -m755 $$prog.wrapper   $(prefix)/bin/$$prog; \
+                install -m755 $$prog.wrapper   $(dprefix)/bin/$$prog; \
         done