From 7ed63b76fee88a30987ea1116fc03f3ef5d2f9e6 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 17 Sep 2002 01:33:05 +0000 Subject: [PATCH] - no more chmod 777 - link iconv binary like the HP-UX example instead of using brain dead libtool --- .../libiconv/patches/patch-src_Makefile_in | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/converters/libiconv/patches/patch-src_Makefile_in b/converters/libiconv/patches/patch-src_Makefile_in index dbc5c7875e5..d1469d8af5e 100644 --- a/converters/libiconv/patches/patch-src_Makefile_in +++ b/converters/libiconv/patches/patch-src_Makefile_in @@ -1,12 +1,19 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2002/06/13 03:45:57 brad Exp $ ---- src/Makefile.in.orig Mon Jun 10 20:22:26 2002 -+++ src/Makefile.in Mon Jun 10 20:22:55 2002 -@@ -78,7 +78,7 @@ install : all force +$OpenBSD: patch-src_Makefile_in,v 1.2 2002/09/17 01:33:05 brad Exp $ +--- src/Makefile.in.orig Wed May 29 10:04:10 2002 ++++ src/Makefile.in Mon Sep 16 20:20:59 2002 +@@ -51,7 +51,6 @@ top_builddir = .. + # without internationalization and not linked with libintl. + + all : iconv_no_i18n iconv.@OBJEXT@ +- chmod 777 . + + # This is the temporary iconv executable, without internationalization. + iconv_no_i18n : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la +@@ -78,6 +77,7 @@ install : all force if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi case "@host_os@" in \ hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ -- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ -+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ ++ openbsd*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ -o iconv;; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ esac $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv -