Mercurial > hg > octave-nkf > gnulib-hg

diff modules/iconv_open @ 14273:8f6d3e05c7e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libposix: Revert the unreviewed part of yesterday's big merge. Back out yesterday's big merge from the libposix branch, except for the openat-die.c change that was reviewed and approved by Paul Eggert. Put the ChangeLog entry at the top, to reflect the order of changes in the master branch.
author Bruce Korb <bkorb@gnu.org>
date Sun, 06 Feb 2011 21:11:40 +0100
parents b4cc3c41ca79
children 8636d98120a9 efab6978105e
line wrap: on
line diff
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -21,9 +21,6 @@
 gl_FUNC_ICONV_OPEN
 
 Makefile.am:
-iconv_headers = iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
-nodist_pkginclude_HEADERS += $(iconv_headers)
-
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
 	mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
@@ -39,10 +36,10 @@
 iconv_open-solaris.h: iconv_open-solaris.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t
 	mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
-BUILT_SOURCES        += $(iconv_headers)
+BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t
-MAINTAINERCLEANFILES += $(iconv_headers)
-EXTRA_DIST           += $(iconv_headers)
+MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
 
 Include:
 <iconv.h>