tclgeomap/makefile.patch

   1 diff -Naur tclgeomap-2.11.3.orig/unix/Makefile.in tclgeomap-2.11.3.new/unix/Makefile.in
   2 --- tclgeomap-2.11.3.orig/unix/Makefile.in      2006-12-20 16:38:04.000000000 -0500
   3 +++ tclgeomap-2.11.3.new/unix/Makefile.in       2007-06-23 18:09:27.000000000 -0400
   4 @@ -115,11 +115,11 @@
   5
   6  # Directory in which to install manual entries for Tcl's C library
   7  # procedures:
   8 -MAN3_INSTALL_DIR       = $(mandir)/man3
   9 +MAN3_INSTALL_DIR       = $(DESTDIR)$(mandir)/man3
  10
  11  # Directory in which to install manual entries for the built-in
  12  # Tcl commands:
  13 -MANN_INSTALL_DIR       = $(mandir)/mann
  14 +MANN_INSTALL_DIR       = $(DESTDIR)$(mandir)/mann
  15
  16  pkgdatadir = $(datadir)/@PACKAGE_NAME@
  17  pkgincludedir = $(includedir)/@PACKAGE_NAME@@PACKAGE_VERSION@
  18 @@ -246,20 +246,20 @@
  19  #========================================================================
  20
  21  install-libraries: libraries
  22 -       $(mkinstalldirs) $(includedir)
  23 -       $(mkinstalldirs) $(pkgincludedir)
  24 +       $(mkinstalldirs) $(DESTDIR)$(includedir)
  25 +       $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
  26         echo "Installing header files in $(pkgincludedir)"
  27         @for i in $(GENERIC_HDRS) ; do \
  28             echo "Installing $$i" ; \
  29 -           $(INSTALL_DATA) $$i $(pkgincludedir) ; \
  30 +           $(INSTALL_DATA) $$i $(DESTDIR)$(pkgincludedir) ; \
  31         done;
  32 -       @for i in `ls $(pkgincludedir)` ; do \
  33 -           rm -f $(includedir)/$$i ; \
  34 +       @for i in `ls $(DESTDIR)$(pkgincludedir)` ; do \
  35 +           rm -f $(DESTDIR)$(includedir)/$$i ; \
  36         done;
  37 -       echo Making $(pkglibdir)
  38 -       $(mkinstalldirs) $(pkglibdir)
  39 -       echo "Installing tclgeomap_procs.tcl in $(pkglibdir)"
  40 -       $(INSTALL_DATA) $(TOP_DIR)/library/tclgeomap_procs.tcl $(pkglibdir)
  41 +       echo Making $(DESTDIR)$(pkglibdir)
  42 +       $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
  43 +       echo "Installing tclgeomap_procs.tcl in $(DESTDIR)$(pkglibdir)"
  44 +       $(INSTALL_DATA) $(TOP_DIR)/library/tclgeomap_procs.tcl $(DESTDIR)$(pkglibdir)
  45
  46  #========================================================================
  47  # Install documentation.  Unix manpages should go in the $(mandir)
  48 @@ -419,16 +419,16 @@
  49           if test -f $$p; then \
  50             ext=`echo $$p|sed -e "s/.*\.//"`; \
  51             if test "x$$ext" = "xdll"; then \
  52 -               echo " $(INSTALL_DATA) $$p $(bindir)/$$p"; \
  53 -               $(INSTALL_DATA) $$p $(bindir)/$$p; \
  54 +               echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
  55 +               $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
  56                 lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
  57                 if test -f $$lib; then \
  58 -                   echo " $(INSTALL_DATA) $$lib $(libdir)/$$lib"; \
  59 -                   $(INSTALL_DATA) $$lib $(libdir)/$$lib; \
  60 +                   echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
  61 +                   $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
  62                 fi; \
  63             else \
  64 -               echo " $(INSTALL_DATA) $$p $(libdir)/$$p"; \
  65 -               $(INSTALL_DATA) $$p $(libdir)/$$p; \
  66 +               echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  67 +               $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
  68             fi; \
  69           else :; fi; \
  70         done
  71 @@ -438,7 +438,7 @@
  72             $(RANLIB) $(libdir)/$$p; \
  73           else :; fi; \
  74         done
  75 -       $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
  76 +       $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
  77
  78  #========================================================================
  79  # Install binary executables (e.g. .exe files)
  80 @@ -449,8 +449,8 @@
  81  install-bin-binaries: installdirs
  82         @list='$(bin_BINARIES)'; for p in $$list; do \
  83           if test -f $$p; then \
  84 -           echo " $(INSTALL_DATA) $$p $(bindir)/$$p"; \
  85 -           $(INSTALL_DATA) $$p $(bindir)/$$p; \
  86 +           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
  87 +           $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
  88           else :; fi; \
  89         done
  90
  91 @@ -473,9 +473,9 @@
  92         done
  93
  94  installdirs:
  95 -       $(mkinstalldirs)  $(libdir)
  96 -       $(mkinstalldirs)  $(bindir)
  97 -       $(mkinstalldirs)  $(pkglibdir)
  98 +       $(mkinstalldirs)  $(DESTDIR)$(libdir)
  99 +       $(mkinstalldirs)  $(DESTDIR)$(bindir)
 100 +       $(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
 101
 102  .PHONY: all binaries clean depend distclean doc install installdirs \
 103  libraries test