* Makefile.am (pkgdata_DATA): Rename from pkgdata_SCRIPTS.

	(config_DATA): Likewise for config_SCRIPTS.
	(baseboard_DATA): Likewise for baseboard_SCRIPTS.
	(EXTRA_DIST): Remove pkgdata_SCRIPTS, config_SCRIPTS and
	baseboard_SCRIPTS.
	* Makefile.in: Regenerate.

Signed-off-by: Ben Elliston <bje@gnu.org>

3 files changed, 47 insertions, 154 deletions

diff --git a/ChangeLog b/ChangeLog
index 73bc44f..4ece904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-08  Makoto Fujiwara  <makoto@ki.nu>
+
+	* Makefile.am (pkgdata_DATA): Rename from pkgdata_SCRIPTS.
+	(config_DATA): Likewise for config_SCRIPTS.
+	(baseboard_DATA): Likewise for baseboard_SCRIPTS.
+	(EXTRA_DIST): Remove pkgdata_SCRIPTS, config_SCRIPTS and
+	baseboard_SCRIPTS.
+	* Makefile.in: Regenerate.
+
 2013-06-08  Ben Elliston  <bje@gnu.org>
 
 	* configure: Regenerate with autoconf 2.69.
diff --git a/Makefile.am b/Makefile.am
index aeaccc6..79e38d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 
 EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest site.tmpl \
-	$(pkgdata_DATA) $(pkgdata_SCRIPTS) \
-	$(config_DATA) $(config_SCRIPTS) \
-	$(baseboard_DATA) $(baseboard_SCRIPTS) \
+	$(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \
 	$(TESTSUITE_FILES) $(XML) $(CONTRIB)
 
 DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log testrun.sum
@@ -36,7 +34,9 @@ all-local:
 bin_SCRIPTS = runtest
 include_HEADERS = dejagnu.h
 
-pkgdata_SCRIPTS = \
+pkgdata_DATA = \
+  stub-loader.c \
+  testglue.c \
   runtest.exp \
   lib/debugger.exp \
   lib/dejagnu.exp \
@@ -56,8 +56,8 @@ pkgdata_SCRIPTS = \
   lib/utils.exp
 
 configdir = $(pkgdatadir)/config
-config_DATA = config/README
-config_SCRIPTS = \
+config_DATA = \
+	config/README \
 	config/adb.exp \
 	config/arc.exp \
 	config/arm-ice.exp \
@@ -101,8 +101,8 @@ config_SCRIPTS = \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
-baseboard_DATA = baseboards/README
-baseboard_SCRIPTS = \
+baseboard_DATA = \
+	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
 	baseboards/arc-sim.exp \
@@ -208,8 +208,6 @@ baseboard_SCRIPTS = \
 	baseboards/xscale-cygmon.exp \
 	baseboards/xtensa-sim.exp
 
-pkgdata_DATA = stub-loader.c testglue.c
-
 djlibexecdir = $(pkgdatadir)/libexec
 djlibexec_SCRIPTS = config.guess
 
diff --git a/Makefile.in b/Makefile.in
index 86acab9..58d1f0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,14 +117,11 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(djlibexecdir)" \
-	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(infodir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" \
-	"$(DESTDIR)$(includedir)"
-SCRIPTS = $(baseboard_SCRIPTS) $(bin_SCRIPTS) $(config_SCRIPTS) \
-	$(djlibexec_SCRIPTS) $(pkgdata_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(djlibexecdir)" \
+	"$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" \
+	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"
+SCRIPTS = $(bin_SCRIPTS) $(djlibexec_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -278,15 +275,15 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = dejagnu
 EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest site.tmpl \
-	$(pkgdata_DATA) $(pkgdata_SCRIPTS) \
-	$(config_DATA) $(config_SCRIPTS) \
-	$(baseboard_DATA) $(baseboard_SCRIPTS) \
+	$(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \
 	$(TESTSUITE_FILES) $(XML) $(CONTRIB)
 
 DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log testrun.sum
 bin_SCRIPTS = runtest
 include_HEADERS = dejagnu.h
-pkgdata_SCRIPTS = \
+pkgdata_DATA = \
+  stub-loader.c \
+  testglue.c \
   runtest.exp \
   lib/debugger.exp \
   lib/dejagnu.exp \
@@ -306,8 +303,8 @@ pkgdata_SCRIPTS = \
   lib/utils.exp
 
 configdir = $(pkgdatadir)/config
-config_DATA = config/README
-config_SCRIPTS = \
+config_DATA = \
+	config/README \
 	config/adb.exp \
 	config/arc.exp \
 	config/arm-ice.exp \
@@ -351,8 +348,8 @@ config_SCRIPTS = \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
-baseboard_DATA = baseboards/README
-baseboard_SCRIPTS = \
+baseboard_DATA = \
+	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
 	baseboards/arc-sim.exp \
@@ -458,7 +455,6 @@ baseboard_SCRIPTS = \
 	baseboards/xscale-cygmon.exp \
 	baseboards/xtensa-sim.exp
 
-pkgdata_DATA = stub-loader.c testglue.c
 djlibexecdir = $(pkgdatadir)/libexec
 djlibexec_SCRIPTS = config.guess
 
@@ -539,41 +535,6 @@ clean-checkPROGRAMS:
 unit$(EXEEXT): $(unit_OBJECTS) $(unit_DEPENDENCIES) $(EXTRA_unit_DEPENDENCIES) 
 	@rm -f unit$(EXEEXT)
 	$(CXXLINK) $(unit_OBJECTS) $(unit_LDADD) $(LIBS)
-install-baseboardSCRIPTS: $(baseboard_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(baseboard_SCRIPTS)'; test -n "$(baseboarddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(baseboarddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(baseboarddir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(baseboarddir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(baseboarddir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-baseboardSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(baseboard_SCRIPTS)'; test -n "$(baseboarddir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(baseboarddir)'; $(am__uninstall_files_from_dir)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -609,41 +570,6 @@ uninstall-binSCRIPTS:
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-install-configSCRIPTS: $(config_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(config_SCRIPTS)'; test -n "$(configdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(configdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(configdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-configSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(config_SCRIPTS)'; test -n "$(configdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
 install-djlibexecSCRIPTS: $(djlibexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(djlibexec_SCRIPTS)'; test -n "$(djlibexecdir)" || list=; \
@@ -679,41 +605,6 @@ uninstall-djlibexecSCRIPTS:
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(djlibexecdir)'; $(am__uninstall_files_from_dir)
-install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-pkgdataSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1317,7 +1208,7 @@ check: check-am
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \
 		all-local
 installdirs:
-	for dir in "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(djlibexecdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(djlibexecdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1376,10 +1267,9 @@ info: info-am
 
 info-am: $(INFO_DEPS)
 
-install-data-am: install-baseboardDATA install-baseboardSCRIPTS \
-	install-configDATA install-configSCRIPTS \
+install-data-am: install-baseboardDATA install-configDATA \
 	install-includeHEADERS install-info-am install-man \
-	install-pkgdataDATA install-pkgdataSCRIPTS
+	install-pkgdataDATA
 
 install-dvi: install-dvi-am
 
@@ -1519,12 +1409,11 @@ ps: ps-am
 
 ps-am: $(PSS)
 
-uninstall-am: uninstall-baseboardDATA uninstall-baseboardSCRIPTS \
-	uninstall-binSCRIPTS uninstall-configDATA \
-	uninstall-configSCRIPTS uninstall-djlibexecSCRIPTS \
+uninstall-am: uninstall-baseboardDATA uninstall-binSCRIPTS \
+	uninstall-configDATA uninstall-djlibexecSCRIPTS \
 	uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \
 	uninstall-info-am uninstall-man uninstall-pdf-am \
-	uninstall-pkgdataDATA uninstall-pkgdataSCRIPTS uninstall-ps-am
+	uninstall-pkgdataDATA uninstall-ps-am
 
 uninstall-man: uninstall-man1
 
@@ -1538,25 +1427,22 @@ uninstall-man: uninstall-man1
 	distclean-DEJAGNU distclean-compile distclean-generic \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am html-local info info-am install install-am \
-	install-baseboardDATA install-baseboardSCRIPTS \
-	install-binSCRIPTS install-configDATA install-configSCRIPTS \
+	install-baseboardDATA install-binSCRIPTS install-configDATA \
 	install-data install-data-am install-djlibexecSCRIPTS \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-includeHEADERS \
 	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am install-pkgdataDATA \
-	install-pkgdataSCRIPTS install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-baseboardDATA uninstall-baseboardSCRIPTS \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-baseboardDATA \
 	uninstall-binSCRIPTS uninstall-configDATA \
-	uninstall-configSCRIPTS uninstall-djlibexecSCRIPTS \
-	uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \
-	uninstall-info-am uninstall-man uninstall-man1 \
-	uninstall-pdf-am uninstall-pkgdataDATA \
-	uninstall-pkgdataSCRIPTS uninstall-ps-am
+	uninstall-djlibexecSCRIPTS uninstall-dvi-am uninstall-html-am \
+	uninstall-includeHEADERS uninstall-info-am uninstall-man \
+	uninstall-man1 uninstall-pdf-am uninstall-pkgdataDATA \
+	uninstall-ps-am
 
 
 # Give a reassuring message so that users know the "build" worked.