blt/blt2.4z-destdir.patch

   1 --- blt2.4z/library/Makefile.in.orig    2008-01-06 20:06:26.000000000 -0800
   2 +++ blt2.4z/library/Makefile.in 2008-01-07 14:52:17.000000000 -0800
   3 @@ -9,6 +9,9 @@
   4  srcdir       = @srcdir@
   5  libdir       = @libdir@
   6  scriptdir    = @BLT_LIBRARY@
   7 +# This should really be set by a configure switch.  For now it's a hack
   8 +# for Fedora.
   9 +pkglibdir    = @libdir@/tcl@TCL_VERSION@/blt$(version)
  10
  11  INSTALL      = @INSTALL@
  12  INSTALL_DATA = @INSTALL_DATA@
  13 @@ -39,7 +42,8 @@
  14                 tclIndex
  15
  16  instdirs     =  $(prefix) $(exec_prefix) \
  17 -               $(libdir) $(prefix)/lib $(scriptdir) $(scriptdir)/dd_protocols
  18 +               $(libdir) $(prefix)/lib $(scriptdir) \
  19 +               $(pkglibdir) $(scriptdir)/dd_protocols
  20
  21  all: pkgIndex
  22
  23 @@ -58,15 +62,15 @@
  24         for i in $(miscFiles) ; do \
  25             $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
  26         done
  27 -       $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
  28 +       $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(pkglibdir)
  29
  30  mkdirs:
  31         @for i in $(instdirs) ; do \
  32            if test -d $(INSTALL_ROOT)$$i ; then \
  33              : ; \
  34            else \
  35 -            echo " mkdir $(INSTALL_ROOT)$$i" ; \
  36 -            mkdir $(INSTALL_ROOT)$$i ; \
  37 +            echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
  38 +            mkdir -p $(INSTALL_ROOT)$$i ; \
  39            fi ; \
  40          done
  41
  42 --- blt2.4z/configure.in.orig   2008-01-06 22:48:37.000000000 -0800
  43 +++ blt2.4z/configure.in        2008-01-06 22:49:57.000000000 -0800
  44 @@ -976,7 +976,9 @@
  45  BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
  46
  47  # Add BLT to the run path
  48 -libdir=${exec_prefix}/lib
  49 +if test "x${libdir}" == "x" ; then
  50 +    libdir=${exec_prefix}/lib
  51 +fi
  52
  53  if test "x${libdir}" != "x"  -a \
  54         "${libdir}" != "/usr/lib" -a  \
  55 --- blt2.4z/demos/Makefile.in.orig      2008-01-06 20:11:25.000000000 -0800
  56 +++ blt2.4z/demos/Makefile.in   2008-01-06 22:02:50.000000000 -0800
  57 @@ -6,7 +6,7 @@
  58  exec_prefix =  @exec_prefix@
  59  version =      @BLT_VERSION@
  60  libdir =       @libdir@
  61 -scriptdir =    $(prefix)/lib/blt$(version)
  62 +scriptdir =    @BLT_LIBRARY@
  63  destdir =      $(scriptdir)/demos
  64  srcdir =       @srcdir@
  65
  66 --- blt2.4z/configure.orig      2008-01-06 22:48:41.000000000 -0800
  67 +++ blt2.4z/configure   2008-01-06 22:49:57.000000000 -0800
  68 @@ -3756,7 +3756,9 @@
  69  BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
  70
  71  # Add BLT to the run path
  72 -libdir=${exec_prefix}/lib
  73 +if test "x${libdir}" == "x" ; then
  74 +    libdir=${exec_prefix}/lib
  75 +fi
  76
  77  if test "x${libdir}" != "x"  -a \
  78         "${libdir}" != "/usr/lib" -a  \
  79 --- blt2.4z/Makefile.in.orig    2008-01-06 13:27:01.000000000 -0800
  80 +++ blt2.4z/Makefile.in 2008-01-06 22:03:26.000000000 -0800
  81 @@ -13,7 +13,7 @@
  82  includedir =   @includedir@
  83  libdir =       @libdir@
  84  version =      @BLT_VERSION@
  85 -scriptdir =    $(prefix)/lib/blt$(version)
  86 +scriptdir =    @BLT_LIBRARY@
  87
  88  instdirs =     $(prefix) \
  89                 $(exec_prefix) \
  90 @@ -28,7 +28,7 @@
  91
  92  INSTALL =      @INSTALL@
  93  INSTALL_DATA = @INSTALL_DATA@
  94 -INSTALL_ROOT =
  95 +INSTALL_ROOT =  @INSTALL_ROOT@
  96  SHELL =                /bin/sh
  97  RM =           rm -f
  98
  99 @@ -47,17 +47,17 @@
 100         (cd library; $(MAKE) install)
 101         (cd man; $(MAKE) install)
 102         (cd demos; $(MAKE) install)
 103 -       $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
 104 -       $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
 105 -       $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
 106 +       $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
 107 +       $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
 108 +       $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
 109
 110  mkdirs:
 111         @for i in $(instdirs) ; do \
 112            if test -d $(INSTALL_ROOT)$$i ; then \
 113             : ; \
 114           else \
 115 -            echo " mkdir $(INSTALL_ROOT)$$i" ; \
 116 -            mkdir $(INSTALL_ROOT)$$i ; \
 117 +            echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
 118 +            mkdir -p $(INSTALL_ROOT)$$i ; \
 119            fi ; \
 120          done
 121
 122 --- blt2.4z/src/Makefile.in.orig        2008-01-06 22:27:58.000000000 -0800
 123 +++ blt2.4z/src/Makefile.in     2008-01-06 22:28:06.000000000 -0800
 124 @@ -22,7 +22,7 @@
 125
 126  bindir =       $(exec_prefix)/bin
 127  exec_prefix =  @exec_prefix@
 128 -incdir =       $(prefix)/include
 129 +incdir =       @includedir@
 130  libdir =       @libdir@
 131  scriptdir =    $(exec_prefix)/lib
 132
 133 --- blt2.4z/man/Makefile.in.orig        2008-01-06 20:09:02.000000000 -0800
 134 +++ blt2.4z/man/Makefile.in     2008-01-06 22:57:34.000000000 -0800
 135 @@ -10,9 +10,9 @@
 136
 137  instdirs       = $(mandir) $(mandir)/mann $(mandir)/man3
 138
 139 -MAN_N          = BLT.n barchart.n beep.n bgexec.n bitmap.n \
 140 +MAN_N          = BLT.n barchart.n beep.n bgexec.n bltbitmap.n \
 141                   bltdebug.n busy.n container.n cutbuffer.n \
 142 -                 dragdrop.n eps.n graph.n hierbox.n  \
 143 +                 dragdrop.n eps.n bltgraph.n hierbox.n  \
 144                   hiertable.n htext.n spline.n stripchart.n \
 145                   table.n tabset.n tile.n tree.n treeview.n vector.n \
 146                   watch.n winop.n
 147 @@ -51,8 +51,8 @@
 148            if test -d $(INSTALL_ROOT)$$i ; then \
 149              : ; \
 150            else \
 151 -            echo " mkdir $(INSTALL_ROOT)$$i" ; \
 152 -            mkdir $(INSTALL_ROOT)$$i ; \
 153 +            echo " mkdir -p $(INSTALL_ROOT)$$i" ; \
 154 +            mkdir -p $(INSTALL_ROOT)$$i ; \
 155            fi ; \
 156         done
 157