Alexandre Julliard : loader: Fix installation for platforms that don' t use extra binaries.

Alexandre Julliard julliard at winehq.org
Mon Mar 23 12:34:57 CDT 2009


Module: wine
Branch: master
Commit: 9701da43b02f4910bdc7dccfe39f731409bb54f7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9701da43b02f4910bdc7dccfe39f731409bb54f7

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Mar 23 15:51:59 2009 +0100

loader: Fix installation for platforms that don't use extra binaries.

---

 loader/Makefile.in |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 1c882c6..ae2f386 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -45,9 +45,13 @@ wine: $(MAIN_OBJS) Makefile.in
 wine-installed: $(MAIN_OBJS) Makefile.in
 	$(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL)
 
-install install-lib:: wine-installed $(EXTRA_BINARIES) $(MANPAGES) $(INSTALLDIRS)
+$(EXTRA_BINARIES:%=__install__%): $(DESTDIR)$(bindir) dummy
+	f=`expr $@ : '__install__\(.*\)'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f
+
+.PHONY: $(EXTRA_BINARIES:%=__install__%)
+
+install install-lib:: wine-installed $(EXTRA_BINARIES:%=__install__%) $(MANPAGES) $(INSTALLDIRS)
 	$(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MODULE)
-	for f in $(EXTRA_BINARIES); do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
 	$(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext)
 	$(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext)
 	$(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)




More information about the wine-cvs mailing list