diff --git a/samples/Makefile.in b/samples/Makefile.in
index 5d35ec5fe9701b8b2db0b22308f1db611788aa5b..68efd733ed1ad8f405276e25d32d13c864b26461 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -58,7 +58,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_1)
+bin_PROGRAMS = $(am__EXEEXT_1)
 subdir = samples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -95,7 +95,9 @@ am__EXEEXT_1 = CreateDOMDocument$(EXEEXT) DOMCount$(EXEEXT) \
 	SAX2Count$(EXEEXT) SAX2Print$(EXEEXT) SAXCount$(EXEEXT) \
 	SAXPrint$(EXEEXT) SCMPrint$(EXEEXT) SEnumVal$(EXEEXT) \
 	StdInParse$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_CreateDOMDocument_OBJECTS =  \
 	src/CreateDOMDocument/CreateDOMDocument.$(OBJEXT)
@@ -357,41 +359,41 @@ sampleprogs = CreateDOMDocument DOMCount DOMPrint EnumVal MemParse \
 CreateDOMDocument_SOURCES = src/CreateDOMDocument/CreateDOMDocument.cpp
 DOMCount_SOURCES = src/DOMCount/DOMCount.cpp
 DOMPrint_SOURCES = src/DOMPrint/DOMPrint.cpp \
-									src/DOMPrint/DOMPrintErrorHandler.cpp \
-									src/DOMPrint/DOMPrintFilter.cpp \
-									src/DOMPrint/DOMTreeErrorReporter.cpp
+							src/DOMPrint/DOMPrintErrorHandler.cpp \
+							src/DOMPrint/DOMPrintFilter.cpp \
+							src/DOMPrint/DOMTreeErrorReporter.cpp
 
 EnumVal_SOURCES = src/EnumVal/EnumVal.cpp
 MemParse_SOURCES = src/MemParse/MemParse.cpp \
-									src/MemParse/MemParseHandlers.cpp
+							src/MemParse/MemParseHandlers.cpp
 
 PParse_SOURCES = src/PParse/PParse.cpp \
-									src/PParse/PParseHandlers.cpp
+							src/PParse/PParseHandlers.cpp
 
 PSVIWriter_SOURCES = src/PSVIWriter/PSVIUni.cpp \
-									src/PSVIWriter/PSVIWriter.cpp \
-									src/PSVIWriter/PSVIWriterHandlers.cpp
+							src/PSVIWriter/PSVIWriter.cpp \
+							src/PSVIWriter/PSVIWriterHandlers.cpp
 
 Redirect_SOURCES = src/Redirect/Redirect.cpp \
-									src/Redirect/RedirectHandlers.cpp
+							src/Redirect/RedirectHandlers.cpp
 
 SAX2Count_SOURCES = src/SAX2Count/SAX2Count.cpp \
-									src/SAX2Count/SAX2CountHandlers.cpp
+							src/SAX2Count/SAX2CountHandlers.cpp
 
 SAX2Print_SOURCES = src/SAX2Print/SAX2FilterHandlers.cpp \
-									src/SAX2Print/SAX2Print.cpp \
-									src/SAX2Print/SAX2PrintHandlers.cpp
+							src/SAX2Print/SAX2Print.cpp \
+							src/SAX2Print/SAX2PrintHandlers.cpp
 
 SAXCount_SOURCES = src/SAXCount/SAXCount.cpp \
-									src/SAXCount/SAXCountHandlers.cpp
+							src/SAXCount/SAXCountHandlers.cpp
 
 SAXPrint_SOURCES = src/SAXPrint/SAXPrint.cpp \
-									src/SAXPrint/SAXPrintHandlers.cpp
+							src/SAXPrint/SAXPrintHandlers.cpp
 
 SCMPrint_SOURCES = src/SCMPrint/SCMPrint.cpp
 SEnumVal_SOURCES = src/SEnumVal/SEnumVal.cpp
 StdInParse_SOURCES = src/StdInParse/StdInParse.cpp \
-									src/StdInParse/StdInParseHandlers.cpp
+							src/StdInParse/StdInParseHandlers.cpp
 
 @XERCES_PRETTY_MAKE_TRUE@PRETTY_MAKE = ${top_srcdir}/config/pretty-make
 @XERCES_PRETTY_MAKE_TRUE@PRETTY_COMPILE = ${PRETTY_MAKE} Compiling
@@ -437,9 +439,30 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
@@ -824,6 +847,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -880,8 +906,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf src/CreateDOMDocument/$(DEPDIR) src/DOMCount/$(DEPDIR) src/DOMPrint/$(DEPDIR) src/EnumVal/$(DEPDIR) src/MemParse/$(DEPDIR) src/PParse/$(DEPDIR) src/PSVIWriter/$(DEPDIR) src/Redirect/$(DEPDIR) src/SAX2Count/$(DEPDIR) src/SAX2Print/$(DEPDIR) src/SAXCount/$(DEPDIR) src/SAXPrint/$(DEPDIR) src/SCMPrint/$(DEPDIR) src/SEnumVal/$(DEPDIR) src/StdInParse/$(DEPDIR)
@@ -901,7 +926,7 @@ info-am:
 
 install-data-am:
 
-install-exec-am:
+install-exec-am: install-binPROGRAMS
 
 install-info: install-info-am
 
@@ -927,19 +952,19 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 #