makefiles: Install bindir programs from the top-level makefile.
diff --git a/Makefile.in b/Makefile.in
index 2697d2b..62ac1f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,9 @@
# Sub-directories that don't have a makefile
EXTRASUBDIRS = dlls libs
+# Destination directories for make install
+INSTALLDIRS = $(DESTDIR)$(bindir)
+
all: wine
@echo "Wine build complete."
diff --git a/aclocal.m4 b/aclocal.m4
index 08f0bcd..1735fd0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -151,7 +151,6 @@
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TEST_BINARIES,"")
-AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
wine_fn_append_file ()
{
@@ -291,14 +290,19 @@
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)"
- if test -n "$ac_install"
- then
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+ test -n "$ac_install" || return
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall"
- test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir
+ if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE"
+ then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"install install-lib:: programs \$(DESTDIR)\$(bindir)
+ \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
+uninstall::
+ \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
fi])
}
diff --git a/configure b/configure
index 7461096..74a51a8 100755
--- a/configure
+++ b/configure
@@ -596,7 +596,6 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
-ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_TEST_BINARIES
ALL_WINETEST_DEPENDS
LDAPLIBS
@@ -13854,8 +13853,6 @@
ALL_TEST_BINARIES=""
-ALL_PROGRAM_BIN_INSTALL_DIRS=""
-
wine_fn_append_file ()
{
@@ -14006,14 +14003,19 @@
programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE)"
- if test -n "$ac_install"
- then
- wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+ test -n "$ac_install" || return
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib:: programs/$ac_dir/Makefile __builddeps__
@cd programs/$ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall"
- test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir
+ if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE"
+ then
+ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
+"install install-lib:: programs \$(DESTDIR)\$(bindir)
+ \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
+uninstall::
+ \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
fi
fi
}
@@ -14704,8 +14706,6 @@
ac_config_files="$ac_config_files Make.tmp:Makefile.in"
-test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
-
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
-rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)"
diff --git a/configure.ac b/configure.ac
index 142d32a..68d6f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2713,9 +2713,6 @@
AC_CONFIG_FILES([Make.tmp:Makefile.in])
-dnl Don't install in bin dir for Windows build
-test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
-
dnl Some final makefile rules
WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
[uninstall::
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 9946998..ebb7547 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -3,11 +3,6 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
-ALL_INSTALLS = @ALL_PROGRAM_BIN_INSTALL_DIRS@
-INSTALLPROGS = $(ALL_INSTALLS:programs/%=%)
-
-INSTALLDIRS = $(DESTDIR)$(bindir)
-
PROGRAMS = wineapploader
@MAKE_RULES@
@@ -16,19 +11,3 @@
wineapploader: wineapploader.in
sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
-
-# Rules for installation
-
-.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
-
-$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy
- $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@`
-
-install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
-install-progs: # nothing to do here
-
-@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
-
-uninstall::
- -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS)
- -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
