Revert non-CharacterSet changes from rev.14472

diff --git a/Makefile.am b/Makefile.am
index 192e00a39354ea81166182379ead18f37f75548b..c582a6284c07f4fd2799b0bfe1c6be1a6e1801ba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,12 @@
 ##
 
 AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
-DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc src helpers test-suite tools
+DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
 SUBDIRS                = compat lib
 if ENABLE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif
-SUBDIRS += scripts icons errors doc src tools helpers test-suite
+SUBDIRS += scripts icons errors doc helpers src tools test-suite
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`