Author: gnichols Date: 2011-07-06 12:31:01 +0000 (Wed, 06 Jul 2011) New Revision: 967

Modified: trunk/server/Makefile trunk/server/cgi/Makefile Log: 702695 - v7 server should have it's own package

Modified: trunk/server/Makefile =================================================================== --- trunk/server/Makefile 2011-07-05 21:03:23 UTC (rev 966) +++ trunk/server/Makefile 2011-07-06 12:31:01 UTC (rev 967) @@ -25,7 +25,7 @@ # svn co $(V7_CATALOG_CCS_REPO) $(V7_CATALOG_CSS_COPY)

install-server: - for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done for file in $(FILES); do cp -f $$file $(DESTDIR)/var/www/v7/$$file; done chcon -R root:object_r:httpd_sys_content_t $(DESTDIR)/var/www/v7

Modified: trunk/server/cgi/Makefile =================================================================== --- trunk/server/cgi/Makefile 2011-07-05 21:03:23 UTC (rev 966) +++ trunk/server/cgi/Makefile 2011-07-06 12:31:01 UTC (rev 967) @@ -30,6 +30,6 @@ mkdir -p $(DESTDIR)$(V7_SERVER_ROOT)/cgi mkdir -p $(DESTDIR)$(V7_SERVER_ROOT)/store for file in $(FILES); do cp -f $$file $(DESTDIR)$(V7_SERVER_ROOT)/cgi/$$file; done - for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done mkdir -p $(DESTDIR)/etc/httpd/conf.d cp -f v7.conf $(DESTDIR)/etc/httpd/conf.d/.