mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-07 09:44:06 +00:00
makefiles: Simplify the installation of program binaries by not attempting to hardlink them.
This commit is contained in:
parent
bdebad094c
commit
7b7444fbca
|
@ -40,7 +40,6 @@ AR = @AR@
|
||||||
ARFLAGS = @ARFLAGS@
|
ARFLAGS = @ARFLAGS@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
LN = @LN@
|
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
TOOLSDIR = @TOOLSDIR@
|
TOOLSDIR = @TOOLSDIR@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
|
|
17
aclocal.m4
vendored
17
aclocal.m4
vendored
|
@ -118,23 +118,6 @@ LIBS="$LIBS $2"
|
||||||
AC_CHECK_FUNCS([$1],[$3],[$4])
|
AC_CHECK_FUNCS([$1],[$3],[$4])
|
||||||
LIBS="$ac_wine_check_funcs_save_LIBS"])
|
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 **** Check for a mingw program, trying the various mingw prefixes ****
|
||||||
dnl
|
dnl
|
||||||
dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path])
|
dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path])
|
||||||
|
|
17
configure
vendored
17
configure
vendored
|
@ -694,7 +694,6 @@ INSTALL_PROGRAM
|
||||||
LDCONFIG
|
LDCONFIG
|
||||||
EGREP
|
EGREP
|
||||||
GREP
|
GREP
|
||||||
LN
|
|
||||||
LN_S
|
LN_S
|
||||||
STRIP
|
STRIP
|
||||||
RANLIB
|
RANLIB
|
||||||
|
@ -4572,22 +4571,6 @@ else
|
||||||
$as_echo "no, using $LN_S" >&6; }
|
$as_echo "no, using $LN_S" >&6; }
|
||||||
fi
|
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 "$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; }
|
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||||||
if test "${ac_cv_path_GREP+set}" = set; then :
|
if test "${ac_cv_path_GREP+set}" = set; then :
|
||||||
|
|
|
@ -246,7 +246,6 @@ AC_SUBST(ARFLAGS,rc)
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_CHECK_TOOL(STRIP,strip,strip)
|
AC_CHECK_TOOL(STRIP,strip,strip)
|
||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
WINE_PROG_LN
|
|
||||||
AC_PROG_EGREP
|
AC_PROG_EGREP
|
||||||
AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
|
AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
|
@ -20,25 +20,16 @@ wineapploader: wineapploader.in
|
||||||
|
|
||||||
# Rules for installation
|
# 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
|
$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy
|
||||||
$(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader
|
$(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@`
|
||||||
|
|
||||||
$(INSTALLPROGS:%=%/__installprog__): install-apploader
|
|
||||||
$(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@`
|
|
||||||
|
|
||||||
install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
|
install-progs.so: $(INSTALLPROGS:%=%/__installprog__)
|
||||||
$(RM) $(DESTDIR)$(bindir)/wineapploader
|
|
||||||
|
|
||||||
install-progs: # nothing to do here
|
install-progs: # nothing to do here
|
||||||
|
|
||||||
@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
|
@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS)
|
||||||
|
|
||||||
uninstall::
|
uninstall::
|
||||||
-cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)
|
-cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS)
|
||||||
-rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
|
-rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
|
||||||
|
|
||||||
# Rules for testing
|
|
||||||
|
|
||||||
check test:: $(SUBDIRS:%=%/__test__)
|
|
||||||
|
|
Loading…
Reference in a new issue