Explorar el Código

Fix more bugs in specfile/makefile

Andy Baugh hace 5 años
padre
commit
39ccdd9483
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 2 1
      Makefile
  2. 2 1
      SPECS/BetterPostgres.spec

+ 2 - 1
Makefile

@@ -10,11 +10,12 @@ pwd  = $(shell pwd)
 all: install register
 
 install:
-	mkdir -p $(DESTDIR)$(ulc)$(tmpl)/ui $(DESTDIR)$(ulc)$(tmpl)/config $(DESTDIR)$(ulc)$(cgi)/js $(DESTDIR)$(ulc)$(cgi)/img $(DESTDIR)$(vcp)/Troglodyne/CGI $(DESTDIR)$(vcp)/Troglodyne/API $(DESTDIR)$(vca) $(DESTDIR)$(vct)/troglodyne/config
+	mkdir -p $(DESTDIR)$(ulc)$(tmpl)/ui $(DESTDIR)$(ulc)$(tmpl)/config $(DESTDIR)$(ulc)$(cgi)/js $(DESTDIR)$(ulc)$(cgi)/img $(DESTDIR)$(vcp)/Troglodyne/CGI $(DESTDIR)$(vcp)/Troglodyne/API $(DESTDIR)$(vca) $(DESTDIR)$(vct)/troglodyne/config $(DESTDIR)$(ulc)/whostmgr/docroot/addon_plugins
 	install $(pwd)/templates/ui/pgupgrade.tmpl $(DESTDIR)$(ulc)$(tmpl)
 	install $(pwd)/templates/config/main.default $(DESTDIR)$(vct)/troglodyne/config
 	install $(pwd)/js/pgupgrade.js $(DESTDIR)$(ulc)$(cgi)/js
 	install $(pwd)/img/troglophant.png $(DESTDIR)$(ulc)$(cgi)/img
+	install $(pwd)/img/troglophant.png $(DESTDIR)$(ulc)/whostmgr/docroot/addon_plugins
 	install $(pwd)/cgi/pgupgrade.cgi $(DESTDIR)$(ulc)$(cgi)
 	install $(pwd)/cgi/api.cgi $(DESTDIR)$(ulc)$(cgi)
 	install $(pwd)/lib/Troglodyne/CGI/PgUpgrade.pm $(DESTDIR)$(vcp)/Troglodyne/CGI

+ 2 - 1
SPECS/BetterPostgres.spec

@@ -31,11 +31,12 @@ make install DESTDIR=%{buildroot}
 %defattr(0700,root,root,-)
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/pgupgrade.cgi
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/api.cgi
+%defattr(0600,root,root,-)
 /usr/local/cpanel/whostmgr/docroot/templates/troglodyne/pgupgrade.tmpl
 /var/cpanel/templates/troglodyne/config/main.default
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/js/pgupgrade.js
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/img/troglophant.png
-%defattr(0600,root,root,-)
+/usr/local/cpanel/whostmgr/docroot/addon_plugins/troglophant.png
 /var/cpanel/perl/Troglodyne/CGI/PgUpgrade.pm
 /var/cpanel/perl/Troglodyne/CGI/API.pm
 /var/cpanel/perl/Troglodyne/CpPostgreSQL.pm