diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-08-17 19:30:50 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-08-17 19:30:50 +0000 |
| commit | 318f0f55146c127ae7404b606454d23fe9752d01 (patch) | |
| tree | e2f25214b719578b31f91fd53ae8874b86450fb1 /makeopts.in | |
| parent | c38cb9586377120b2aea5651b4df025cee315b60 (diff) | |
Merged revisions 332369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r332369 | tilghman | 2011-08-17 14:24:59 -0500 (Wed, 17 Aug 2011) | 17 lines
Merged revisions 332355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r332355 | tilghman | 2011-08-17 14:21:36 -0500 (Wed, 17 Aug 2011) | 10 lines
Re-add support for spaces in pathnames, including now spaces in DESTDIR.
This was initially added to 1.8 prior to release, primarily to support the
standard paths on Mac OS X, but was partially reverted recently in Subversion,
due to the lack of support for spaces in DESTDIR. This commit restores support
for the standard paths on Mac OS X, and also includes support for spaces in
DESTDIR.
(closes issue ASTERISK-18290)
Reported by: pabelanger
Review: https://reviewboard.asterisk.org/r/1326/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in index c7a5eafc6..5914f4746 100644 --- a/makeopts.in +++ b/makeopts.in @@ -34,6 +34,8 @@ XMLSTARLET=@XMLSTARLET@ MD5=@MD5@ SHA1SUM=@SHA1SUM@ OPENSSL=@OPENSSL@ +MAKE_PREINSTALL=@MAKE_PREINSTALL@ +MAKE_POSTINSTALL=@MAKE_POSTINSTALL@ BUILD_PLATFORM=@BUILD_PLATFORM@ BUILD_CPU=@BUILD_CPU@ @@ -91,6 +93,35 @@ ASTSPOOLDIR = @astspooldir@ ASTLOGDIR = @astlogdir@ ASTVARRUNDIR = @astvarrundir@ +MAKE_prefix = @MAKE_prefix@ +MAKE_exec_prefix = @MAKE_exec_prefix@ + +MAKE_datarootdir = @MAKE_datarootdir@ +MAKE_datadir = @MAKE_datadir@ +MAKE_includedir = @MAKE_includedir@ +MAKE_infodir = @MAKE_infodir@ +MAKE_libdir = @MAKE_libdir@ +MAKE_libexecdir = @MAKE_libexecdir@ +MAKE_localstatedir = @MAKE_localstatedir@ +MAKE_mandir = @MAKE_mandir@ +MAKE_sbindir = @MAKE_sbindir@ +MAKE_sharedstatedir = @MAKE_sharedstatedir@ +MAKE_sysconfdir = @MAKE_sysconfdir@ + +MAKE_ASTSBINDIR = @MAKE_astsbindir@ +MAKE_ASTETCDIR = @MAKE_astetcdir@ +MAKE_ASTHEADERDIR = @MAKE_astheaderdir@ +MAKE_ASTLIBDIR = @MAKE_astlibdir@ +MAKE_ASTMANDIR = @MAKE_astmandir@ +MAKE_astvarlibdir = @MAKE_astvarlibdir@ +MAKE_ASTVARLIBDIR = @MAKE_astvarlibdir@ +MAKE_ASTDATADIR = @MAKE_astdatadir@ +MAKE_ASTDBDIR = @MAKE_astdbdir@ +MAKE_ASTKEYDIR = @MAKE_astkeydir@ +MAKE_ASTSPOOLDIR = @MAKE_astspooldir@ +MAKE_ASTLOGDIR = @MAKE_astlogdir@ +MAKE_ASTVARRUNDIR = @MAKE_astvarrundir@ + AST_DEVMODE=@AST_DEVMODE@ NOISY_BUILD=@NOISY_BUILD@ |