diff --git a/Makefile.in b/Makefile.in
index 6cf96f9e7d3eb7d44269ec5f151f08ffcaccd9ca..face85fc7728261bd63886a7139ac03f39dd07e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,7 +157,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/configure b/configure
index 59ffa732cb4389cd055ec2877f3f090591d09c05..0ee10d09c8c9f8b2b09f2931e8742704d705f15c 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PAX GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBXPM_CFLAGS LIBXPM_LDFLAGS LIBXPM_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4MCS_MANAGER_CFLAGS LIBXFCE4MCS_MANAGER_LIBS LIBXFCE4MCS_MANAGER_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION RANDR_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBXPM_CFLAGS LIBXPM_LDFLAGS LIBXPM_LIBS PKG_CONFIG LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4MCS_MANAGER_CFLAGS LIBXFCE4MCS_MANAGER_LIBS LIBXFCE4MCS_MANAGER_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION RANDR_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -20223,51 +20223,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-
-# Extract the first word of "pax", so it can be a program name with args.
-set dummy pax; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PAX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PAX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PAX="$PAX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PAX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PAX=$ac_cv_path_PAX
-
-if test -n "$PAX"; then
-  echo "$as_me:$LINENO: result: $PAX" >&5
-echo "${ECHO_T}$PAX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test -z "$PAX"; then
-  { { echo "$as_me:$LINENO: error: pax (the POSIX standard archive tool) is not found on your system, you can get a version from ftp://ftp.suse.com/pub/people/kukuk/pax/" >&5
-echo "$as_me: error: pax (the POSIX standard archive tool) is not found on your system, you can get a version from ftp://ftp.suse.com/pub/people/kukuk/pax/" >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
@@ -25584,7 +25539,6 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@PAX@,$PAX,;t t
 s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
 s,@USE_NLS@,$USE_NLS,;t t
 s,@MSGFMT@,$MSGFMT,;t t
diff --git a/configure.ac b/configure.ac
index 5bf1b5558c0cf6940097ec0be10e16ccf54f01ec..c37d60bf735351e6dcc6880b94db28b4722afecc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,14 +23,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-dnl
-dnl Check for pax.
-dnl
-AC_PATH_PROG([PAX], [pax])
-if test -z "$PAX"; then
-  AC_MSG_ERROR([pax (the POSIX standard archive tool) is not found on your system, you can get a version from ftp://ftp.suse.com/pub/people/kukuk/pax/])
-fi
-
 dnl Check C Compiler Characteristics
 AC_C_CONST
 AC_C_INLINE
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index 642f800e492926bb3d1b97082f9b4fc170e87e76..0e85d8ef4b6cb73fb34f70aac77b6222beb9559f 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index 99a92bd92e12c6d8a1cb9ca65e370a34f91e27ef..5ba74fc80a84ad32805ce8d077c06c636bbc158e 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -143,7 +143,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index d8f9f701ccf36f5b3d26a1f1040763dda52a8915..57a887714a1407ed61009c49451a20910072a733 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fccefb8b40b2e3a225fbea021698aefdcb9a5a4f..74de274302404ba8ad2ab0b56e0527d2292a278a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -141,7 +141,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index 9ed0bd303e03a33625b0f57b9c12286990e1e383..cb8e8547beccc996368094d146dc75dd19719b97 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -143,7 +143,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index 0e017f5c966f97fed17243a895df3e6651e63cbf..26d192e37691e8d83e46cbd5e307f2159ececb0e 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index 298ffaf2029194a62db9da9da2c46830f00ff784..6bed3dba4d6d79a12095e2060ff82d6d33b74acd 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -169,7 +169,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 98c863759c600ca4ee3d61b025cc601bb17b2071..e6bba09ae3fa1d1e54fdd6905d8287018306c2f1 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:35+0200\n"
+"POT-Creation-Date: 2004-04-25 23:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -299,7 +299,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/client.c:577
+#: src/client.c:568
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index ed0a39ed5dae7b00178293f634075ddee7ab8ba8..6e3756be4e2dfa195ebc3003845bf280be5f5b93 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -182,7 +182,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/themes/Makefile.in b/themes/Makefile.in
index c71f71d0ec1e2f6d088a0c26e9d4a313755a3f35..974c15d64aea6cb9d04e32968df491bdb548d189 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -142,7 +142,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/themes/default-4.0/Makefile.am b/themes/default-4.0/Makefile.am
index 4c38da05bc5fb09f6045ed5116592ab9d92daf98..94dbc2736e201a874d7f5c20f94af01c40d8616a 100644
--- a/themes/default-4.0/Makefile.am
+++ b/themes/default-4.0/Makefile.am
@@ -54,8 +54,3 @@ theme_DATA = 								\
 	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
diff --git a/themes/default-4.0/Makefile.in b/themes/default-4.0/Makefile.in
index 0cc8d9194ff62571eca3e20043a78b38f7c7a92b..2dda5a6ebb20ca53d13cf49e6f0313c5f9d03696 100644
--- a/themes/default-4.0/Makefile.in
+++ b/themes/default-4.0/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -297,6 +296,15 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
 
 uninstall-themeDATA:
 	@$(NORMAL_UNINSTALL)
@@ -424,11 +432,6 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
 
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index 4508e7cfe4f3be9e4637857bc209f602006fe99e..2bc5fadd82f968ca3f90f9af553397dc1bdc642f 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index b4409bd40184db4ff4559a658f686bfadaeddaa3..b150feebf7fd515506b430698206d93d764885b2 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -56,8 +56,3 @@ theme_DATA = 								\
 	top-right-active.xpm						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index 2f2a622c6e023da00914575c6a2e6c728d25068a..cef9a772098f979a3850af38457717ac3eddb66f 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -299,6 +298,15 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
 
 uninstall-themeDATA:
 	@$(NORMAL_UNINSTALL)
@@ -426,11 +434,6 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
 
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/opta/Makefile.am b/themes/opta/Makefile.am
index 3dd7737712c6d03406115bf0630968e883572f1d..99c24f229300bd5d065711c561fe9bcffbeea66d 100644
--- a/themes/opta/Makefile.am
+++ b/themes/opta/Makefile.am
@@ -60,8 +60,3 @@ theme_DATA = \
 	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
diff --git a/themes/opta/Makefile.in b/themes/opta/Makefile.in
index 443c14f092ed4b40ba52ae7f9b0d7175f60eca1c..244c3ec73f6bb97d4f9c587d205d5142f4cc278f 100644
--- a/themes/opta/Makefile.in
+++ b/themes/opta/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -303,6 +302,15 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
 
 uninstall-themeDATA:
 	@$(NORMAL_UNINSTALL)
@@ -430,11 +438,6 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
 
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/synthetic/Makefile.am b/themes/synthetic/Makefile.am
index b1d2dfeeea5bbee0f89ee92e0da4f20fcd5ba494..9919067f608c7761e99421b81e7517f07b282481 100644
--- a/themes/synthetic/Makefile.am
+++ b/themes/synthetic/Makefile.am
@@ -54,8 +54,3 @@ theme_DATA = \
 	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
diff --git a/themes/synthetic/Makefile.in b/themes/synthetic/Makefile.in
index 97506a227f75d8a04c852ab46a3e82670609ca14..e84396454847cd34dc5e144e9fd5db9cb8b349de 100644
--- a/themes/synthetic/Makefile.in
+++ b/themes/synthetic/Makefile.in
@@ -134,7 +134,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PAX = @PAX@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -297,6 +296,15 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkdir_p) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
 
 uninstall-themeDATA:
 	@$(NORMAL_UNINSTALL)
@@ -424,11 +432,6 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
 
-
-install-themeDATA:
-	rm -Rf $(DESTDIR)$(themedir); 					\
-	$(mkinstalldirs) $(DESTDIR)$(themedir); 			\
-	pax -rw $(theme_DATA) $(DESTDIR)$(themedir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: