diff options
| author | Vladimir Volovich <vvv@vsu.ru> | 2008-05-31 23:30:52 +0000 |
|---|---|---|
| committer | Vladimir Volovich <vvv@vsu.ru> | 2008-05-31 23:30:52 +0000 |
| commit | 1060b44bfc9b3a6f33d267f2c1c07c0fbce8ea98 (patch) | |
| tree | 7369c2403fca7b1fb6d897340bd1f01d3edd0956 | |
| parent | 69a81989414624f5d5c11baeb61295e0226bd855 (diff) | |
"make install" would fail on systems such as Solaris which don't have a "BSD-compatible install"
in case a relative path to configure is used. don't pass the INSTALL* variables (with potentially
relative paths) when calling make in sub-directories: it would fail with relative paths.
they already contain all these INSTALL* variables, so there's no need to pass it.
git-svn-id: svn://tug.org/texlive/trunk@8441 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/Makefile.in | 3 | ||||
| -rw-r--r-- | Build/source/texk/web2c/Makefile.in | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index ce7a2deb29f..48bff423245 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -15,8 +15,7 @@ kpse_include make/makevars.mk # if we are to propagate changes at the top level. # XMAKEARGS is for the user to override. makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(makevars) $(XMAKEARGS) -installargs = INSTALL_DATA='$(INSTALL_DATA)' \ - INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(makeargs) +installargs = $(makeargs) # Not everything from common.mk is relevant to this top-level # Makefile, but most of it is, and it doesn't seem worth separating the diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 7bb63a08a7b..feb9887b713 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -69,9 +69,7 @@ socketlibs = @socketlibs@ common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS) window_makeargs = x_cppflags='$(x_cppflags)' $(common_makeargs) -install_makeargs = INSTALL='$(INSTALL)' INSTALL_DATA='$(INSTALL_DATA)' \ - INSTALL_PROGRAM='$(INSTALL_PROGRAM)' \ - $(makevars) $(common_makeargs) +install_makeargs = $(makevars) $(common_makeargs) proglib = lib/lib.a windowlib = window/window.a |