cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- no more chmod 777

Browse Source 
- link iconv binary like the HP-UX example instead of using brain dead libtool
This commit is contained in:
brad 2002-09-17 01:33:05 +00:00
parent 410ae9bae6
commit 7ed63b76fe
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
converters/libiconv/patches/patch-src_Makefile_in
View File

@ -1,12 +1,19 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2002/06/13 03:45:57 brad Exp $ $OpenBSD: patch-src_Makefile_in,v 1.2 2002/09/17 01:33:05 brad Exp $
--- src/Makefile.in.orig Mon Jun 10 20:22:26 2002 --- src/Makefile.in.orig Wed May 29 10:04:10 2002
+++ src/Makefile.in Mon Jun 10 20:22:55 2002 +++ src/Makefile.in Mon Sep 16 20:20:59 2002
@@ -78,7 +78,7 @@ install : all force @@ -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 if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \ case "@host_os@" in \
hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ + openbsd*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
esac esac
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv