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

fix installation of libiconv.

Browse Source
This commit is contained in:
brad 2002-06-13 03:45:57 +00:00
parent 8600d410f6
commit 8695839788
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
converters/libiconv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2002/06/10 04:41:48 brad Exp $ # $OpenBSD: Makefile,v 1.14 2002/06/13 03:45:57 brad Exp $
COMMENT= "character set conversion library" COMMENT= "character set conversion library"
@ -20,8 +20,9 @@ SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf ${WRKSRC}/libcharset/autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf ${WRKSRC}/libcharset/autoconf
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --enable-extra-encodings CONFIGURE_ARGS+= --enable-static \
CONFIGURE_ENV= LDFLAGS="-L${WRKBUILD}/lib/.libs" --enable-extra-encodings \
--disable-nls
do-regress: do-regress:
@cd ${WRKBUILD}/tests && \ @cd ${WRKBUILD}/tests && \

12
converters/libiconv/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$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
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;; \
esac
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv