Module: wine Branch: master Commit: 7b7444fbcad4a0a56e842f645e42a28fa18be1bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7444fbcad4a0a56e842f645e...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 3 11:50:24 2010 +0100
makefiles: Simplify the installation of program binaries by not attempting to hardlink them.
---
Make.rules.in | 1 - aclocal.m4 | 17 ----------------- configure | 17 ----------------- configure.ac | 1 - programs/Makefile.in | 17 ++++------------- 5 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index c7813b0..e155d88 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,7 +40,6 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ -LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/aclocal.m4 b/aclocal.m4 index aedffae..a88883a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -118,23 +118,6 @@ LIBS="$LIBS $2" AC_CHECK_FUNCS([$1],[$3],[$4]) LIBS="$ac_wine_check_funcs_save_LIBS"])
-dnl **** Check for ln **** -dnl -dnl Usage: WINE_PROG_LN -dnl -AC_DEFUN([WINE_PROG_LN], -[AC_MSG_CHECKING([whether ln works]) -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - AC_SUBST(LN,ln) - AC_MSG_RESULT([yes]) -else - AC_SUBST(LN,["cp -p"]) - AC_MSG_RESULT([no, using $LN]) -fi -rm -f conf$$ conf$$.file]) - dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) diff --git a/configure b/configure index 2ae042f..537eb04 100755 --- a/configure +++ b/configure @@ -694,7 +694,6 @@ INSTALL_PROGRAM LDCONFIG EGREP GREP -LN LN_S STRIP RANLIB @@ -4572,22 +4571,6 @@ else $as_echo "no, using $LN_S" >&6; } fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 -$as_echo_n "checking whether ln works... " >&6; } -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - LN=ln - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - LN="cp -p" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5 -$as_echo "no, using $LN" >&6; } -fi -rm -f conf$$ conf$$.file { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then : diff --git a/configure.ac b/configure.ac index f823045..b8b04c2 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,6 @@ AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) AC_PROG_LN_S -WINE_PROG_LN AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) AC_PROG_INSTALL diff --git a/programs/Makefile.in b/programs/Makefile.in index b339aa3..eff82f9 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -20,25 +20,16 @@ wineapploader: wineapploader.in
# Rules for installation
-.PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) +.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
-install-apploader: wineapploader $(INSTALLDIRS) dummy - $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader - -$(INSTALLPROGS:%=%/__installprog__): install-apploader - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@` +$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy + $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@`
install-progs.so: $(INSTALLPROGS:%=%/__installprog__) - $(RM) $(DESTDIR)$(bindir)/wineapploader - install-progs: # nothing to do here
@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__)