From 2d76f6325ac57604d9b04c4481d6180fecc2bfaf Mon Sep 17 00:00:00 2001 From: Karsten Keil Date: Thu, 25 Mar 2010 14:06:52 +0100 Subject: Revert "Add .gitignore" Only .gitignore should be updated This reverts commit 51655a18970b6117e6102f6ca7541b53fb6f568e. --- Makefile.am | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 8e44c17..b56560b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,23 +20,22 @@ ## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301, USA. -#INSTALLdir = $(DESTDIR)/usr/local/lcr +INSTALLdir = $(DESTDIR)/usr/local/lcr pkglogdir=$(localstatedir)/log/@PACKAGE@ pkgsysconfdir=$(sysconfdir)/@PACKAGE@ -CONFIGdir=$(DESTDIR)$(pkgsysconfdir) -SHAREdir=$(DESTDIR)$(pkgdatadir) -LOGdir=$(DESTDIR)$(pkglogdir) -EXTENSIONdir=$(DESTDIR)$(localstatedir)/lib/lcr/extensions +#CONFIGdir=$(DESTDIR)$(pkgsysconfdir) +#SHAREdir=$(DESTDIR)$(pkgdatadir) +#LOGdir=$(DESTDIR)$(pkglogdir) +#EXTENSIONdir=$(DESTDIR)$(localstatedir)/lib/lcr +CONFIGdir=$(INSTALLdir) +SHAREdir=$(INSTALLdir) +LOGdir=$(INSTALLdir) +EXTENSIONdir=$(INSTALLdir)/extensions -#CONFIGdir=$(INSTALLdir) -#SHAREdir=$(INSTALLdir) -#LOGdir=$(INSTALLdir) -#EXTENSIONdir=$(INSTALLdir)/extensions - -astmoddir = $(DESTDIR)/$(libdir)/asterisk/modules +astmoddir = $(DESTDIR)/usr/lib/asterisk/modules INSTALLATION_DEFINES = \ -DCONFIG_DATA="\"$(CONFIGdir)\"" \ -- cgit v1.2.3-55-g7522