From 6855bb873f51efb00c0182d7a9da374d8354deff Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 19 Jul 2011 21:32:54 +0000 Subject: Merged revisions 328879 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/2.0 ................ r328879 | kpfleming | 2011-07-19 16:31:16 -0500 (Tue, 19 Jul 2011) | 23 lines Merged revisions 328878 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r328878 | kpfleming | 2011-07-19 16:29:07 -0500 (Tue, 19 Jul 2011) | 17 lines Revert partial attempt at handling pathnames with spaces. Revision 299794 attempted to improve the build system to be able to handle pathnames (primarily DESTDIR) with spaces in them, since this is common on some platforms (including Mac OSX). Unfortunately, the changes were incomplete and did not actually provide the desired behavior, and as a side effect the functionality that ensured that stale headers in the Asterisk 'include' directory were removed got broken. In addition, the check for stale (and possibly incompatible) modules in the Asterisk 'modules' directory also got broken, and would never report any stale modules. Users upgrading to this version or later versions would then see unexpected module load errors. Since there are few users who actually want to install Asterisk into paths that contain spaces, and a proper fix for the build system would take many hours, the best solution for now is to just revert the partial solution. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328881 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile.moddir_rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.moddir_rules') diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index b0bc148ac..b883548af 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -122,7 +122,7 @@ clean:: install:: all @echo "Installing modules from `basename $(CURDIR)`..." - @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(MODULES_DIR)" ; done + @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done uninstall:: -- cgit v1.2.3