summaryrefslogtreecommitdiff
path: root/editors/abiword/files/patch-at
blob: 0793c7dca3168f81520b1b80831c9f02034d72e4 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
--- config/require/unix/Makefile.orig	Tue Jan  2 16:21:42 2001
+++ config/require/unix/Makefile	Tue Jan  2 16:23:08 2001
@@ -164,22 +164,6 @@
 
 _LIBICONV_:
 
-ifdef __FreeBSD__
-		@if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
-			echo Found libiconv in peer directory;                  \
-			if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then  \
-				cd $(ABI_ROOT)/../libiconv;                     \
-				./configure;                                    \
-			fi;                                                     \
-			$(MAKE) -f Makefile.abi -C $(ABI_ROOT)/../libiconv;     \
-		else                                                            \
-			echo libiconv not found;                                \
-			echo TODO provide a nicer error message;                \
-			echo TODO with instructions for obtaining it;           \
-			exit 1;                                                 \
-		fi								
-
-else
 	@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then	\
 		if [ -d $(ABI_ROOT)/../libiconv ]; then                        	\
 			echo Found libiconv in peer directory;                  \
@@ -200,7 +184,6 @@
 		echo "*** are the versions of the libraries we should link against.";			\
 		echo ;								\
 	fi
-endif
 
 #################################################################