diff --git a/src/Makefile.am b/src/Makefile.am index a7397fd34..dd61ba160 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,9 +3,14 @@ AUTOMAKE_OPTIONS = gnu LDADD = @MYSQL_LIBS@ CPPFLAGS = @MYSQL_CFLAGS@ +# You need to set this to your CGI directory cgidir = /var/www/cgi-bin -bin_PROGRAMS = zmc zma zmu +# And these to the user and group of your webserver +webuser = apache +webgroup = apache + cgi_PROGRAMS = zms +bin_PROGRAMS = zmc zma zmu zm_SOURCES = zm.cpp zmdbg.c jmemdst.c zmc_SOURCES = zmc.cpp $(zm_SOURCES) @@ -16,3 +21,8 @@ zmu_SOURCES = zmu.cpp $(zm_SOURCES) noinst_HEADERS = zm.h zmcfg.h zmdbg.h jinclude.h font_6x11.h EXTRA_DIST = + +# Yes, you are correct. This is a HACK! +install-exec-local: + ( cd @bindir@; mv $(cgi_PROGRAMS) $(cgidir) ) + ( cd $(cgidir); chown $(webuser):$(webgroup) $(cgi_PROGRAMS) ) diff --git a/src/Makefile.in b/src/Makefile.in index 9ff230c7b..2b61b621d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -11,10 +11,6 @@ # PARTICULAR PURPOSE. -# IMPORTANT: Set these to your web server user and group -WEBUSR = apache -WEBGRP = apache - SHELL = @SHELL@ srcdir = @srcdir@ @@ -52,7 +48,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -o $(WEBUSR) -g $(WEBGRP) +INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : @@ -76,9 +72,14 @@ AUTOMAKE_OPTIONS = gnu LDADD = @MYSQL_LIBS@ CPPFLAGS = @MYSQL_CFLAGS@ +# You need to set this to your CGI directory cgidir = /var/www/cgi-bin -bin_PROGRAMS = zmc zma zmu +# And these to the user and group of your webserver +webuser = apache +webgroup = apache + cgi_PROGRAMS = zms +bin_PROGRAMS = zmc zma zmu zm_SOURCES = zm.cpp zmdbg.c jmemdst.c zmc_SOURCES = zmc.cpp $(zm_SOURCES) @@ -186,8 +187,8 @@ install-cgiPROGRAMS: $(cgi_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(cgidir) @list='$(cgi_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -339,7 +340,7 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-exec-local install-exec: install-exec-am install-data-am: install-cgiPROGRAMS @@ -401,13 +402,19 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir mostlyclean-depend \ distclean-depend clean-depend maintainer-clean-depend info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-local install-exec-am install-exec install-data-am \ +install-data install-am install uninstall-am uninstall all-redirect \ +all-am all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean +# Yes, you are correct. This is a HACK! +install-exec-local: + ( cd @bindir@; mv $(cgi_PROGRAMS) $(cgidir) ) + ( cd $(cgidir); chown $(webuser):$(webgroup) $(cgi_PROGRAMS) ) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/web/Makefile.am b/web/Makefile.am index 7c13d8b70..d024e05de 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -1,6 +1,15 @@ AUTOMAKE_OPTIONS = gnu +# You need to set this to your web directory webdir = /var/www/html +# And these to the user and group of your webserver +webuser = apache +webgroup = apache + web_DATA = zmactions.php zmconfig.php zmdb.php zmfilter.php zmfuncs.php zmhtml.php zm.php zmstyles.css zmwml.php EXTRA_DIST = $(web_DATA) + +# Yes, you are correct. This is a HACK! +install-data-local: + ( cd $(webdir); chown $(webuser):$(webgroup) $(web_DATA) ) diff --git a/web/Makefile.in b/web/Makefile.in index 1a8dee991..4fe2ddfa8 100644 --- a/web/Makefile.in +++ b/web/Makefile.in @@ -11,10 +11,6 @@ # PARTICULAR PURPOSE. -# IMPORTANT: Set these to your web server user and group -WEBUSR = apache -WEBGRP = apache - SHELL = @SHELL@ srcdir = @srcdir@ @@ -49,7 +45,7 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ -INSTALL = @INSTALL@ -o $(WEBUSR) -g $(WEBGRP) +INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -73,7 +69,12 @@ bindir = @bindir@ AUTOMAKE_OPTIONS = gnu +# You need to set this to your web directory webdir = /var/www/html +# And these to the user and group of your webserver +webuser = apache +webgroup = apache + web_DATA = zmactions.php zmconfig.php zmdb.php zmfilter.php zmfuncs.php zmhtml.php zm.php zmstyles.css zmwml.php EXTRA_DIST = $(web_DATA) @@ -154,7 +155,7 @@ installcheck: installcheck-am install-exec-am: install-exec: install-exec-am -install-data-am: install-webDATA +install-data-am: install-webDATA install-data-local install-data: install-data-am install-am: all-am @@ -199,12 +200,16 @@ maintainer-clean: maintainer-clean-am .PHONY: uninstall-webDATA install-webDATA tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# Yes, you are correct. This is a HACK! +install-data-local: + ( cd $(webdir); chown $(webuser):$(webgroup) $(web_DATA) ) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: