linux/sane/19990428-sane-install-hpux.diff

   1 diff -ur sane-1.0.1/ChangeLog sane-1.0.1-pere/ChangeLog
   2 --- sane-1.0.1/ChangeLog        Mon Apr 19 18:21:33 1999
   3 +++ sane-1.0.1-pere/ChangeLog   Wed Apr 28 01:26:32 1999
   4 @@ -1,3 +1,9 @@
   5 +1999-04-28  Petter Reinholdtsen <pere@td.org.uit.no>
   6 +
   7 +       * backend/Makefile.in (install): Correct target to work on
   8 +       platforms where dll endings isn't .so.  Extract endings from
   9 +       libsane-dll.la.
  10 +
  11  1999-04-19  David Mosberger-Tang  <David.Mosberger@acm.org>
  12
  13         * Version 1.0.1 released.
  14 diff -ur sane-1.0.1/backend/Makefile.in sane-1.0.1-pere/backend/Makefile.in
  15 --- sane-1.0.1/backend/Makefile.in      Sun Apr  4 01:00:44 1999
  16 +++ sane-1.0.1-pere/backend/Makefile.in Wed Apr 28 01:23:20 1999
  17 @@ -94,21 +94,26 @@
  18             || exit 1; \
  19         done
  20         @$(LIBTOOL) $(MINST) --finish $(libsanedir)
  21 -       @list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
  22 -         file=libsane-$${be}.so.$(V_MAJOR); \
  23 +       @# Assume the dll name without any versions is last
  24 +       @dllend=`grep library_names= libsane-dll.la |rev|cut -d" " -f1|rev|sed 's/libsane-dll.//'|cut -d\' -f1`; \
  25 +       list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
  26 +         file=libsane-$${be}.$$dllend.$(V_MAJOR); \
  27           lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
  28           if test ! -f $${file} -a -n "$${lib}"; then \
  29             $(LN_S) $${lib} $${file}; \
  30           fi; \
  31         done
  32 -       rm -f $(libdir)/libsane.a $(libdir)/libsane.so \
  33 -               $(libdir)/libsane.so.$(V_MAJOR)*
  34 -       $(LN_S) sane/libsane-dll.a $(libdir)/libsane.a
  35 -       $(LN_S) sane/libsane-dll.so $(libdir)/libsane.so
  36 -       @cd $(libsanedir) && for n in libsane-dll.so.$(V_MAJOR)*; do \
  37 +       @# Assume the dll name without any versions is last
  38 +       @dllend=`grep library_names= libsane-dll.la |rev|cut -f1 -d" "|rev|sed 's/libsane-dll.//'|cut -f1 -d\'`; \
  39 +       rm -f $(libdir)/libsane.a $(libdir)/libsane.$$dllend \
  40 +               $(libdir)/libsane.$$dllend.$(V_MAJOR)*; \
  41 +       $(LN_S) sane/libsane-dll.a $(libdir)/libsane.a; \
  42 +       $(LN_S) sane/libsane-dll.$$dllend $(libdir)/libsane.$$dllend ; \
  43 +       cd $(libsanedir) && for n in libsane-dll.$$dllend.$(V_MAJOR)*; do \
  44           nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
  45           (cd ..; $(LN_S) sane/$$n $$nn); \
  46         done || exit 1
  47 +       $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
  48         @list="$(CONFIGS)"; for cfg in $$list; do \
  49           if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
  50           if test -f $(configdir)/$${cfg}; then \