Fix postinstall bug

diff --git a/BRANCHES b/BRANCHES
index 3a69322101746730a8ac9d9e166b8622cf05f91b..a1ddbc3dd86b37c7f55bee0c80a30c66f4c366fe 100644 (file)
--- a/BRANCHES
+++ b/BRANCHES
@@ -69,3 +69,5 @@ v1_3_1
 v1_3_2
    |
 v1_3_3
+   |
+v1_3_4

diff --git a/ChangeLog b/ChangeLog
index f2492b57adfdb8fbc0f099987aaf8facbf17de49..31b8ac0ed0f2fd2a2c2213a697288f75ab2f1bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,24 @@
+2009-04-22  Charles Wilson  <cwilson@...>
+
+       Release 1.3.4
+       * configure.ac: Bump version number.
+       * Makefile.am: Fix post-install.
+       * BRANCHES: Update.
+       * NEWS: Update.
+
 2009-04-21  Charles Wilson  <cwilson@...>
 
        * src/cygicons/README: Remove trailing spaces.
        * NEWS: Update.
        * PROGLIST: Fix typos.
-       * BRANCHES: Updated.
+       * BRANCHES: Update.
        * configure.ac: Bump version number. Update
        to libtool-2.2 idioms. Require ac-2.63. Require
        gettext-0.17. Modify dist to use lzma. 
-       * ABOUT-NLS: Regenerated.
-       * INSTALL: Regenerated.
-       * config.h.in: Regenerated.
-       * po/Makefile.in.in: Regenerated.
+       * ABOUT-NLS: Regenerate.
+       * INSTALL: Regenerate.
+       * config.h.in: Regenerate.
+       * po/Makefile.in.in: Regenerate.
 
 2008-09-04  Alex Smith  <madalexonline@yahoo.co.uk>
 

diff --git a/Makefile.am b/Makefile.am
index a2e23ca167efd90444f03151df2073eb79abfb25..317223948f07b3630a6e449975f2cddcbad8fc30 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ include_HEADERS = $(windows_headers)
 man_MANS = src/cygstart/cygstart.1 \
        src/mkshortcut/mkshortcut.1 \
        src/readshortcut/readshortcut.1 \
-       src/lpr/lpr.1 
+       src/lpr/lpr.1
 
 doc_DATA = \
        AUTHORS COPYING ChangeLog HOW-TO-CONTRIBUTE \
@@ -117,11 +117,12 @@ src_cygicons_libicons_la_LDFLAGS = -version-info 0:0:0 -no-undefined
 install-exec-hook: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        $(mkdir_p) $(DESTDIR)$(bindir)
-       @for p in d2u u2d dos2unix unix2dos; do \
+       @t=`echo conv|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+       for p in d2u u2d dos2unix unix2dos; do \
          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
          f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) src/conv/conv${EXEEXT} $(DESTDIR)$(bindir)/$$f"; \
-         $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) src/conv/conv${EXEEXT} $(DESTDIR)$(bindir)/$$f; \
+         echo "(cd $(DESTDIR)$(bindir) && ln -f $$t $$f)"; \
+         (cd $(DESTDIR)$(bindir) && ln -f $$t $$f); \
        done
        if [ -e $(DESTDIR)$(libdir)/libicons.dll.a ]; then \
          (cd $(DESTDIR)$(libdir) && mv libicons.dll.a libcygicons.dll.a) ;\

diff --git a/NEWS b/NEWS
index 0d2ae24877a30ebce6fab09282636768f8cf3132..bbbd529da8b09cc8a07a9a648efbd50bf0240f53 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.3.4
+  Fix installation bug, exposed by new libtool's modified
+  behavior (reported by Jerry Hedden and David Rothenberger)
+
 1.3.3
   cygstart: Add new -w/--wait option (Barry Kelly)
             Propagate exit status of child process when -w (Alex Smith)

diff --git a/configure.ac b/configure.ac
index fcc916c36cbda7ed33afd49cc4e39d5f2433c91a..996fb004dbdd8debcb3781bcabc88197244918c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.63)
-AC_INIT(cygutils, 1.3.3, cygwin@cygwin.com)
+AC_INIT(cygutils, 1.3.4, cygwin@cygwin.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -22,6 +22,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
+AC_PROG_LN_S
 
 LT_INIT([win32-dll dlopen disable-static])
 LT_LANG([Windows Resource])