From 00a8f14fb1d794a5379ca35f5328266489343adf Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Thu, 25 Aug 2011 15:30:46 +0000 Subject: Merged revisions 333203 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r333203 | qwell | 2011-08-25 10:29:56 -0500 (Thu, 25 Aug 2011) | 15 lines Merged revisions 333201 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r333201 | qwell | 2011-08-25 10:27:06 -0500 (Thu, 25 Aug 2011) | 8 lines Fix installation into directories containing spaces. This also vastly simplifies the logic in sounds/Makefile (Closes issue ASTERISK-18290) Reported by: Paul Belanger Review: https://reviewboard.asterisk.org/r/1379/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333204 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- makeopts.in | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'makeopts.in') diff --git a/makeopts.in b/makeopts.in index 5914f4746..c7a5eafc6 100644 --- a/makeopts.in +++ b/makeopts.in @@ -34,8 +34,6 @@ XMLSTARLET=@XMLSTARLET@ MD5=@MD5@ SHA1SUM=@SHA1SUM@ OPENSSL=@OPENSSL@ -MAKE_PREINSTALL=@MAKE_PREINSTALL@ -MAKE_POSTINSTALL=@MAKE_POSTINSTALL@ BUILD_PLATFORM=@BUILD_PLATFORM@ BUILD_CPU=@BUILD_CPU@ @@ -93,35 +91,6 @@ 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@ -- cgit v1.2.3