Merged revisions 333268 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 25 Aug 2011 19:01:39 +0000 (19:01 +0000)
committerJason Parker <jparker@digium.com>
Thu, 25 Aug 2011 19:01:39 +0000 (19:01 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r333268 | qwell | 2011-08-25 14:01:18 -0500 (Thu, 25 Aug 2011) | 9 lines

  Merged revisions 333267 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r333267 | qwell | 2011-08-25 14:00:55 -0500 (Thu, 25 Aug 2011) | 2 lines

    Fix for DESTDIR spaces patch.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333269 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index a3d1865..a653bcf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -857,7 +857,7 @@ _uninstall: $(SUBDIRS_UNINSTALL)
        rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
        $(MAKE) -C sounds uninstall
 
        rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
        $(MAKE) -C sounds uninstall
 
-uninstall: preinstall_spaces _uninstall postinstall_spaces
+uninstall: _uninstall
        @echo " +--------- Asterisk Uninstall Complete -----+"  
        @echo " + Asterisk binaries, sounds, man pages,     +"  
        @echo " + headers, modules, and firmware builds,    +"  
        @echo " +--------- Asterisk Uninstall Complete -----+"  
        @echo " + Asterisk binaries, sounds, man pages,     +"  
        @echo " + headers, modules, and firmware builds,    +"