couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r648050 - in /incubator/couchdb/trunk: configure.ac etc/Makefile.am etc/couchdb/Makefile.am
Date Mon, 14 Apr 2008 23:16:13 GMT
Author: nslater
Date: Mon Apr 14 16:15:55 2008
New Revision: 648050

URL: http://svn.apache.org/viewvc?rev=648050&view=rev
Log:
removed non-standard use of .dist configuration files

Modified:
    incubator/couchdb/trunk/configure.ac
    incubator/couchdb/trunk/etc/Makefile.am
    incubator/couchdb/trunk/etc/couchdb/Makefile.am

Modified: incubator/couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=648050&r1=648049&r2=648050&view=diff
==============================================================================
--- incubator/couchdb/trunk/configure.ac (original)
+++ incubator/couchdb/trunk/configure.ac Mon Apr 14 16:15:55 2008
@@ -214,8 +214,9 @@
 AC_CONFIG_FILES([bin/couchjs.tpl])
 AC_CONFIG_FILES([bin/couchdb.tpl])
 AC_CONFIG_FILES([bin/Makefile])
-AC_CONFIG_FILES([etc/couch_httpd.conf.tpl])
-AC_CONFIG_FILES([etc/couch.ini.tpl])
+AC_CONFIG_FILES([etc/couchdb/Makefile])
+AC_CONFIG_FILES([etc/couchdb/couch_httpd.conf.tpl])
+AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl])
 AC_CONFIG_FILES([etc/default/couchdb.tpl])
 AC_CONFIG_FILES([etc/default/Makefile])
 AC_CONFIG_FILES([etc/init/couchdb.tpl])

Modified: incubator/couchdb/trunk/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/Makefile.am?rev=648050&r1=648049&r2=648050&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/Makefile.am Mon Apr 14 16:15:55 2008
@@ -14,48 +14,28 @@
 
 couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
 
-SUBDIRS = default init launchd logrotate.d
+SUBDIRS = couchdb default init launchd logrotate.d
 
-default_sysconf_data = logrotate.d/couchdb.dist
-
-pkgconf_DATA = couch.ini.dist couch_httpd.conf.dist
-
-nobase_dist_pkgconf_DATA = conf/mime.types
+default_sysconf_data = logrotate.d/couchdb
 
 if INIT
-init_sysconf_data = default/couchdb.dist
-init_DATA = init/couchdb.dist
+init_sysconf_data = default/couchdb
+init_DATA = init/couchdb
 endif
 
 if LAUNCHD
-launchd_DATA = launchd/org.apache.couchdb.plist.dist
+launchd_DATA = launchd/org.apache.couchdb.plist
 endif
 
 nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
 
-CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA) $(pkgconf_DATA)
+CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA)
 
 transform = @program_transform_name@
 couchdb_command_name = `echo couchdb | sed '$(transform)'`
 couchjs_command_name = `echo couchjs | sed '$(transform)'`
 
-couch.ini.dist: couch.ini.tpl
-	sed -e "s|%bindir%|@bindir@|g" \
-	    -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
-	< $< > $@
-
-couch_httpd.conf.dist: couch_httpd.conf.tpl
-	sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	< $< > $@
-
-default/couchdb.dist: default/couchdb.tpl
+default/couchdb: default/couchdb.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) default; \
 	else \
@@ -69,7 +49,7 @@
 	    -e "s|%localstatedir%|@localstatedir@|" \
 	< $< > $@
 
-init/couchdb.dist: init/couchdb.tpl
+init/couchdb: init/couchdb.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) init; \
 	else \
@@ -84,10 +64,10 @@
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@
 
-logrotate.d/couchdb.dist: logrotate.d/couchdb.tpl
+logrotate.d/couchdb: logrotate.d/couchdb.tpl
 	sed -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" < $< > $@
 
-launchd/org.apache.couchdb.plist.dist: launchd/org.apache.couchdb.plist.tpl
+launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) launchd; \
 	else \
@@ -101,28 +81,6 @@
 	< $< > $@
 
 install-data-hook:
-	if test $(init_DATA); then \
+	if test -n "$(init_DATA)"; then \
 	    chmod 755 "$(DESTDIR)$(initdir)/couchdb"; \
-	    mv -i "$(DESTDIR)$(sysconfdir)/default/couchdb.dist" \
-	        "$(DESTDIR)$(sysconfdir)/default/couchdb"; \
-	    mv -i "$(DESTDIR)$(initdir)/couchdb.dist" \
-	        "$(DESTDIR)$(initdir)/couchdb"; \
-	fi
-	if test $(launchd_DATA); then \
-	    mv -i "$(DESTDIR)$(launchddir)/org.apache.couchdb.plist.dist" \
-	        "$(DESTDIR)$(launchddir)/org.apache.couchdb.plist"; \
 	fi
-	mv -i "$(DESTDIR)/$(sysconfdir)/logrotate.d/couchdb.dist" \
-	    "$(DESTDIR)/$(sysconfdir)/logrotate.d/couchdb"
-	mv -i "$(DESTDIR)/$(pkgconfdir)/couch.ini.dist" \
-	    "$(DESTDIR)/$(pkgconfdir)/couch.ini"
-	mv -i "$(DESTDIR)/$(pkgconfdir)/couch_httpd.conf.dist" \
-	    "$(DESTDIR)/$(pkgconfdir)/couch_httpd.conf"
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(initdir)/couchdb
-	rm -f $(DESTDIR)$(launchddir)/org.apache.couchdb.plist
-	rm -f $(DESTDIR)$(sysconfdir)/default/couchdb
-	rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/couchdb
-	rm -f $(DESTDIR)/$(pkgconfdir)/couch.ini
-	rm -f $(DESTDIR)/$(pkgconfdir)/couch_httpd.conf

Modified: incubator/couchdb/trunk/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/Makefile.am?rev=648050&r1=648049&r2=648050&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/couchdb/Makefile.am Mon Apr 14 16:15:55 2008
@@ -10,4 +10,27 @@
 ## License for the specific language governing permissions and limitations
 ## under the License.
 
-## This file intentionally left blank.
+datarootdir = @prefix@/share
+
+pkgconf_DATA = couch.ini couch_httpd.conf
+
+nobase_dist_pkgconf_DATA = conf/mime.types
+
+CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA)
+
+couch.ini: couch.ini.tpl
+	sed -e "s|%bindir%|@bindir@|g" \
+	    -e "s|%pkgconfdir%|@pkgconfdir@|g" \
+	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
+	    -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
+	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
+	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
+	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
+	< $< > $@
+
+couch_httpd.conf: couch_httpd.conf.tpl
+	sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \
+	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
+	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
+	< $< > $@
+



Mime
View raw message