I forgot to attach the patch :/
-------- Beginning of forwarded message -------- > I meant to fixed the frontend/Makefile.am. Previously, I left a note in > frontend/Makefile.am as a TODO. I removed the TODO and fixed the > frontent/perl directory as it was not installed earlier. I did a build test > and install. So to make sure the changes did not do anything un-expected. > > The `git diff frontend/Makefile.am > FOO.patch' patch is attached, but here > is a quick glance as the the line differences: > > # -- directives for rules > > +# Name frontend/perl directory for use in directives > +sv_frontend_perl_topdir = $(sv_frontend_topdir)/perl > + > +# Give file mode for installable files: applies to sv_frontend_topdir > sv_directory_mode = 0755 > sv_file_mode = 0644 > > +# For .pl files, they must be executable (either CGI/mod_perl) > +sv_perlfile_mode = 0655 > + > > # -- install-data-hook rule > > - `find $(sv_frontend_topdir) -type f` > + `find $(sv_frontend_topdir) -name '*.php' -type f` > + @chmod $(sv_perlfile_mode) \ > + `find $(sv_frontend_perl_topdir) -name '*.pl' -type f`
diff --git a/frontend/Makefile.am b/frontend/Makefile.am index f9480bd..5b73495 100644 --- a/frontend/Makefile.am +++ b/frontend/Makefile.am @@ -1,7 +1,5 @@ # Makefile.am for frontend/ -# TODO: forgot to cp frontend/perl. Need to add that. - SUBDIRS = php/images EXTRA_DIST = . @@ -11,9 +9,16 @@ curr_pkgname = @PACKAGE_TARNAME@ # Set some parameters for the install-data-hook below sv_frontend_topdir = $(DESTDIR)$(localstatedir)/$(curr_pkgname)/frontend +# Name frontend/perl directory for use in directives +sv_frontend_perl_topdir = $(sv_frontend_topdir)/perl + +# Give file mode installable files: applies to sv_frontend_topdir sv_directory_mode = 0755 sv_file_mode = 0644 +# For .pl files, they must be executable (either CGI/mod_perl) +sv_perlfile_mode = 0655 + # This hook does: copies recursively all files in frontend/ directory to $(prefix)/var or $(DESTDIR)$(localstatedir) to be more specific. Remove any Makefile.am's copied over from previous "bulk" operation. These files will be read and executed by mod_php in Apache httpd install-data-hook: @echo "Installing files in frontend/ directory to $(DESTDIR)$(localstatedir)" @@ -22,7 +27,9 @@ install-data-hook: @chmod $(sv_directory_mode) \ `find $(sv_frontend_topdir) -type d` @chmod $(sv_file_mode) \ - `find $(sv_frontend_topdir) -type f` + `find $(sv_frontend_topdir) -name '*.php' -type f` + @chmod $(sv_perlfile_mode) \ + `find $(sv_frontend_perl_topdir) -name '*.pl' -type f` @-rm -f `find $(sv_frontend_topdir) -name 'Makefile*' -type f` uninstall-hook:
