[Fedora-directory-commits] adminserver Makefile.am, 1.3, 1.4 Makefile.in, 1.3, 1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23549/adminserver

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Change the pre configuration program to use the standard adminutil pset and admldapInfo interfaces to get the default configuration information.  No sense having code duplicated all over the place.
2) Change pre-config to allow passed in config, security, log, and pid directories, or get from env. vars., as the post-config (update) program does.
3) Removed the Apache stuff.  This will be set during the build process.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	15 May 2007 00:30:48 -0000	1.3
+++ Makefile.am	15 May 2007 22:57:53 -0000	1.4
@@ -105,7 +105,7 @@
 	-DCMDBINDIR=\"$(cmdbindir)\" -DMANUALDIR=\"$(manualdir)\" \
 	-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
 	-DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
-	-DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \
+	-DPIDFILE=\"$(pidfile)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \
 	-DBUILD_NUM=$(BUILDNUM) -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\"
 
 lib_LTLIBRARIES = libds-admin-serv.la


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in	15 May 2007 00:30:48 -0000	1.3
+++ Makefile.in	15 May 2007 22:57:53 -0000	1.4
@@ -474,7 +474,7 @@
 	-DMANUALDIR=\"$(manualdir)\" -DCONFIGDIR=\"$(configdir)\" \
 	-DSECURITYDIR=\"$(securitydir)\" -DLOGDIR=\"$(logdir)\" \
 	-DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
-	-DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" \
+	-DPIDFILE=\"$(pidfile)\" -DDATADIR=\"$(datadir)\" \
 	-DLDIFDIR=\"$(ldifdir)\" -DBUILD_NUM=$(BUILDNUM) \
 	-DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\"
 lib_LTLIBRARIES = libds-admin-serv.la