X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ficonv_open;h=8aa5e8f1327e127fbce57b286d14c3792a1c1f27;hb=ca3910da774f8ae6c4a2b6b8a8729b10ccc97ad4;hp=420f5627719efe48afb21a0e4235748065353ccc;hpb=8119dc1622611078f2fca227cf94d65ab1765ce5;p=gnulib.git

diff --git a/modules/iconv_open b/modules/iconv_open
index 420f56277..8aa5e8f13 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -12,7 +12,7 @@ m4/iconv_h.m4
 m4/iconv_open.m4
 
 Depends-on:
-absolute-header
+include_next
 iconv
 c-ctype
 
@@ -28,7 +28,8 @@ BUILT_SOURCES += $(ICONV_H)
 iconv.h: iconv_.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''ABSOLUTE_ICONV_H''@|$(ABSOLUTE_ICONV_H)|g' \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
 	      < $(srcdir)/iconv_.h; \
 	} > $@-t
@@ -37,16 +38,16 @@ MOSTLYCLEANFILES += iconv.h iconv.h-t
 
 GPERF = gperf
 iconv_open-aix.h: iconv_open-aix.gperf
-	$(GPERF) -m 10 iconv_open-aix.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $@-t
 	mv $@-t $@
 iconv_open-hpux.h: iconv_open-hpux.gperf
-	$(GPERF) -m 10 iconv_open-hpux.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $@-t
 	mv $@-t $@
 iconv_open-irix.h: iconv_open-irix.gperf
-	$(GPERF) -m 10 iconv_open-irix.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $@-t
 	mv $@-t $@
 iconv_open-osf.h: iconv_open-osf.gperf
-	$(GPERF) -m 10 iconv_open-osf.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h
 MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t
@@ -61,4 +62,3 @@ LGPL
 
 Maintainer:
 Bruno Haible
-