--- Makefile.tplt.orig 2004-08-04 12:57:03.570939706 -0700 +++ Makefile.tplt 2004-08-04 14:29:50.250726400 -0700 @@ -92,19 +92,19 @@ $(INSTALL_DATA)/gdata $(INSTALL_DATA)/perl install-locale install-message install-lib: - -mkdir -p $(INSTALL_LIB) - cd src; cp $(LIBS) $(INSTALL_LIB) - cp $(TEXT) $(INSTALL_LIB) + -mkdir -p ${D}$(INSTALL_LIB) + cd src; cp $(LIBS) ${D}$(INSTALL_LIB) + cp $(TEXT) ${D}$(INSTALL_LIB) install-prog: - -mkdir -p $(INSTALL_SBIN) - -mkdir -p $(INSTALL_BIN) - cp built/argusd $(INSTALL_SBIN) - cp built/argusctl $(INSTALL_SBIN) - cp built/arguscgi $(INSTALL_SBIN) - cp built/graphd $(INSTALL_LIB) - cp built/picasso $(INSTALL_LIB) - cp built/argus-config $(INSTALL_BIN) + -mkdir -p ${D}$(INSTALL_SBIN) + -mkdir -p ${D}$(INSTALL_BIN) + cp built/argusd ${D}$(INSTALL_SBIN) + cp built/argusctl ${D}$(INSTALL_SBIN) + cp built/arguscgi ${D}$(INSTALL_SBIN) + cp built/graphd ${D}$(INSTALL_LIB) + cp built/picasso ${D}$(INSTALL_LIB) + cp built/argus-config ${D}$(INSTALL_BIN) # in case the format of the auth file has changed remove-auth: @@ -115,44 +115,44 @@ # while a+rwx may be not be optimal security-wise, # it reduces the amount of support email the author receives $(INSTALL_DATA): - mkdir -p $(INSTALL_DATA)/stats $(INSTALL_DATA)/html $(INSTALL_DATA)/notify - touch $(INSTALL_DATA)/log - perl -e 'print getppid, "\n"' > $(INSTALL_DATA)/notno - chmod a+rwx $(INSTALL_DATA) - chmod a+r $(INSTALL_DATA)/html $(INSTALL_DATA)/log + mkdir -p ${D}$(INSTALL_DATA)/stats ${D}$(INSTALL_DATA)/html ${D}$(INSTALL_DATA)/notify + touch ${D}$(INSTALL_DATA)/log + perl -e 'print getppid, "\n"' > ${D}$(INSTALL_DATA)/notno + chmod a+rwx ${D}$(INSTALL_DATA) + chmod a+r ${D}$(INSTALL_DATA)/html ${D}$(INSTALL_DATA)/log @echo '' @echo creating example files... @sleep 1 - @cp examples/users $(INSTALL_DATA)/users.example - @cp examples/config $(INSTALL_DATA)/config.example + @cp examples/users ${D}$(INSTALL_DATA)/users.example + @cp examples/config ${D}$(INSTALL_DATA)/config.example @echo '' - @echo '***' you will need to create/edit the files \'$(INSTALL_DATA)/config\' - @echo '*** ' and \'$(INSTALL_DATA)/users\' - @echo '***' be sure to check permissions on \'$(INSTALL_DATA)\' and its contents + @echo '***' you will need to create/edit the files \'${D}$(INSTALL_DATA)/config\' + @echo '*** ' and \'${D}$(INSTALL_DATA)/users\' + @echo '***' be sure to check permissions on \'${D}$(INSTALL_DATA)\' and its contents @echo '' # if this is an upgrade, gdata might not exist even though data does $(INSTALL_DATA)/gdata: $(INSTALL_DATA) - if test ! -d $(INSTALL_DATA)/gdata; then mkdir $(INSTALL_DATA)/gdata; \ - chmod a+rwx $(INSTALL_DATA)/gdata; fi - if test ! -d $(INSTALL_DATA)/gcache; then mkdir $(INSTALL_DATA)/gcache; \ - chmod a+rwx $(INSTALL_DATA)/gcache; fi + if test ! -d ${D}$(INSTALL_DATA)/gdata; then mkdir -p ${D}$(INSTALL_DATA)/gdata; \ + chmod a+rwx ${D}$(INSTALL_DATA)/gdata; fi + if test ! -d ${D}$(INSTALL_DATA)/gcache; then mkdir -p ${D}$(INSTALL_DATA)/gcache; \ + chmod a+rwx ${D}$(INSTALL_DATA)/gcache; fi $(INSTALL_DATA)/perl: $(INSTALL_DATA) - if test ! -d $(INSTALL_DATA)/perl; then \ - mkdir $(INSTALL_DATA)/perl; \ - chmod a+rwx $(INSTALL_DATA)/perl; \ + if test ! -d ${D}$(INSTALL_DATA)/perl; then \ + mkdir -p ${D}$(INSTALL_DATA)/perl; \ + chmod a+rwx ${D}$(INSTALL_DATA)/perl; \ fi install-locale: $(INSTALL_DATA) - if test ! -d $(INSTALL_DATA)/locale; then \ - mkdir $(INSTALL_DATA)/locale; \ - chmod a+rx $(INSTALL_DATA)/locale; \ + if test ! -d ${D}$(INSTALL_DATA)/locale; then \ + mkdir -p ${D}$(INSTALL_DATA)/locale; \ + chmod a+rx ${D}$(INSTALL_DATA)/locale; \ fi - cp locale/* $(INSTALL_DATA)/locale \ + cp locale/* ${D}$(INSTALL_DATA)/locale \ install-conf: - cp built/conf.pl $(INSTALL_LIB) + cp built/conf.pl ${D}$(INSTALL_LIB) HTML/config-details.html: $(BUILD) built/argusd -DH > HTML/config-details.html