[csw-devel] SF.net SVN: gar:[11465] csw/mgar/pkg/proftpd/trunk/Makefile

[aigoshin at users.sourceforge.net]

Revision: 11465
          http://gar.svn.sourceforge.net/gar/?rev=11465&view=rev
Author:   aigoshin
Date:     2010-11-01 15:22:54 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
proftpd: 20101101 rc3

Modified Paths:
--------------
    csw/mgar/pkg/proftpd/trunk/Makefile

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-01 14:42:03 UTC (rev 11464)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-01 15:22:54 UTC (rev 11465)
@@ -35,14 +35,10 @@
 CONFIGURE_ENV  += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 EXTRA_LIB       = $(prefix)/mysql5/lib/mysql
 
+NODIRPATHS      = --libexecdir --localstatedir
 CONFIGURE_ARGS += $(DIRPATHS)
-# These are now taken from DIRPATHS
-#CONFIGURE_ARGS += --prefix=$(prefix)
-#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
-# TODO: Adjust the variables so $DIRPATHES contains the correct locations
-#CONFIGURE_ARGS += --localstatedir=/var/run/proftpd
-#CONFIGURE_ARGS += --mandir=$(prefix)/share/man
-#CONFIGURE_ARGS += --libexecdir=$(prefix)/lib/proftpd
+CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/proftpd
+CONFIGURE_ARGS += --localstatedir=/var/run/proftpd
 CONFIGURE_ARGS += --enable-dso --disable-static
 CONFIGURE_ARGS += --enable-facl
 CONFIGURE_ARGS += --enable-openssl
@@ -77,4 +73,5 @@
 	ginstall -d $(DESTDIR)$(localstatedir)/proftpd/logs
 	cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/
 	cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd
+	rm -f $(DESTDIR)$(prefix)/libexec/proftpd/*.la
 	$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.