[Oar-commits] r2708 - trunk

bzizou at users.gforge.inria.fr bzizou at users.gforge.inria.fr
Tue Mar 30 16:47:41 CEST 2010


Author: bzizou
Date: 2010-03-30 16:47:41 +0200 (Tue, 30 Mar 2010)
New Revision: 2708

Modified:
   trunk/Makefile
Log:
Moved Monika/userInfos.cgi into DOCDIR/examples because it is not a working script by default (depends on the authentication config of the site)

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-03-29 09:22:06 UTC (rev 2707)
+++ trunk/Makefile	2010-03-30 14:47:41 UTC (rev 2708)
@@ -106,8 +106,8 @@
 	-chown $(OAROWNER).$(OAROWNERGROUP) $(DESTDIR)$(CGIDIR)/oarapi/oarapi-debug.cgi
 	-chmod 6755 $(DESTDIR)$(CGIDIR)/oarapi/oarapi-debug.cgi
 	@if [ -f $(DESTDIR)$(OARCONFDIR)/apache-api.conf ]; then echo "Warning: $(DESTDIR)$(OARCONFDIR)/apache-api.conf already exists, not overwriting it." ; else install -m 0600 API/apache2.conf $(DESTDIR)$(OARCONFDIR)/apache-api.conf ; chown $(WWWUSER) $(DESTDIR)$(OARCONFDIR)/apache-api.conf || /bin/true ; fi
-	install -d -m 0755 $(DESTDIR)$(DOCDIR)
-	install -m 0644 API/oarapi_examples.txt $(DESTDIR)$(DOCDIR)
+	install -d -m 0755 $(DESTDIR)$(DOCDIR)/examples
+	install -m 0644 API/oarapi_examples.txt $(DESTDIR)$(DOCDIR)/examples
 	install -m 0644 API/INSTALL $(DESTDIR)$(DOCDIR)/API_INSTALL
 	install -m 0644 API/TODO $(DESTDIR)$(DOCDIR)/API_TODO
 	@if [ -f $(DESTDIR)$(OARCONFDIR)/api_html_header.pl ]; then echo "Warning: $(DESTDIR)$(OARCONFDIR)/api_html_header.pl already exists, not overwriting it." ; else install -m 0600 API/api_html_header.pl $(DESTDIR)$(OARCONFDIR)/api_html_header.pl ; chown $(OAROWNER) $(DESTDIR)$(OARCONFDIR)/api_html_header.pl || /bin/true ; fi
@@ -133,8 +133,8 @@
 	-chown $(OAROWNER).$(OAROWNERGROUP) $(DESTDIR)$(CGIDIR)/oarapi/oargridapi-debug.cgi
 	-chmod 6755 $(DESTDIR)$(CGIDIR)/oarapi/oargridapi-debug.cgi
 	@if [ -f $(DESTDIR)$(OARCONFDIR)/apache-gridapi.conf ]; then echo "Warning: $(DESTDIR)$(OARCONFDIR)/apache-gridapi.conf already exists, not overwriting it." ; else install -m 0600 API/apache2-grid.conf $(DESTDIR)$(OARCONFDIR)/apache-gridapi.conf ; chown $(WWWUSER) $(DESTDIR)$(OARCONFDIR)/apache-gridapi.conf || /bin/true ; fi
-	install -d -m 0755 $(DESTDIR)$(DOCDIR)
-	install -m 0644 API/oargridapi_examples.txt $(DESTDIR)$(DOCDIR)
+	install -d -m 0755 $(DESTDIR)$(DOCDIR)/examples
+	install -m 0644 API/oargridapi_examples.txt $(DESTDIR)$(DOCDIR)/examples
 	install -m 0644 API/oargridapi.txt $(DESTDIR)$(DOCDIR)
 	install -m 0644 API/INSTALL $(DESTDIR)$(DOCDIR)/API_INSTALL
 	install -m 0644 API/TODO $(DESTDIR)$(DOCDIR)/API_TODO
@@ -496,6 +496,7 @@
 	-chown $(WWWUSER) $(DESTDIR)$(VARLIBDIR)/drawgantt-files/cache
 
 monika:
+	install -d -m 0755 $(DESTDIR)$(DOCDIR)/examples
 	install -d -m 0755 $(DESTDIR)$(CGIDIR)
 	install -d -m 0755 $(DESTDIR)$(OARCONFDIR)
 	install -d -m 0755 $(DESTDIR)$(WWWDIR)
@@ -503,7 +504,7 @@
 	@if [ -f $(DESTDIR)$(OARCONFDIR)/monika.conf ]; then echo "Warning: $(DESTDIR)$(OARCONFDIR)/monika.conf already exists, not overwriting it." ; else install -m 0600 VisualizationInterfaces/Monika/monika.conf $(DESTDIR)$(OARCONFDIR) ; chown $(WWWUSER) $(DESTDIR)$(OARCONFDIR)/monika.conf || /bin/true ; fi
 	install -m 0755 VisualizationInterfaces/Monika/monika.cgi $(DESTDIR)$(CGIDIR)
 	perl -i -pe "s#Oardir = .*#Oardir = '$(OARCONFDIR)'\;#;;" $(DESTDIR)$(CGIDIR)/monika.cgi
-	install -m 0755 VisualizationInterfaces/Monika/userInfos.cgi $(DESTDIR)$(CGIDIR)
+	install -m 0755 VisualizationInterfaces/Monika/userInfos.cgi $(DESTDIR)$(DOCDIR)/examples
 	install -m 0644 VisualizationInterfaces/Monika/monika.css $(DESTDIR)$(WWWDIR)
 	install -d -m 0755 $(DESTDIR)$(PERLLIBDIR)/monika
 	install -m 0644 VisualizationInterfaces/Monika/monika/VERSION $(DESTDIR)$(PERLLIBDIR)/monika




More information about the Oar-commits mailing list