All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit ba77f01b authored by Kirk Webb's avatar Kirk Webb

Revert changes to www/GNUmakefile.in

Don't use separate directory for PhantomNet files.
parent 5137fd26
......@@ -161,10 +161,6 @@ BOOTSTJS = $(wildcard $(SRCDIR)/aptui/bootstrap/js/*)
HELPERSCSS = $(wildcard $(SRCDIR)/aptui/formhelpers/css/*)
HELPERSJS = $(wildcard $(SRCDIR)/aptui/formhelpers/js/*)
PNETFILES = $(wildcard $(SRCDIR)/pnet/*.php)
PNETFILES += $(wildcard $(SRCDIR)/pnet/*.html)
PNETFILES += $(SRCDIR)/pnet/php.ini
# need to make it *.gz; with simply "*",
# we end up sucking over "CVS"
DOWNLOADFILES = $(wildcard $(SRCDIR)/downloads/*.gz)
......@@ -231,7 +227,6 @@ ALLBOOTSTCSS = $(notdir $(BOOTSTCSS))
ALLBOOTSTJS = $(notdir $(BOOTSTJS))
ALLHELPCSS = $(notdir $(HELPERSCSS))
ALLHELPJS = $(notdir $(HELPERSJS))
ALLPNET = $(notdir $(PNETFILES))
INSTALLFILES = $(addprefix $(INSTALL_SBINDIR)/, htmlinstall) \
$(addprefix $(INSTALL_WWWDIR)/, $(ALLFILES)) \
......@@ -258,7 +253,7 @@ INSTALLFILES = $(addprefix $(INSTALL_SBINDIR)/, htmlinstall) \
$(INSTALL_WWWDIR)/wikidocs/wiki/ignore.html \
$(INSTALL_WWWDIR)/doc/LICENSE.txt
install: $(INSTALLFILES) apt-install pnet-install
install: $(INSTALLFILES) apt-install
-mkdir -p $(INSTALL_WWWDIR)/wikidocs/wiki
cd $(INSTALL_WWWDIR) && \
rm -f tbdb.html; \
......@@ -283,7 +278,6 @@ apt-install: $(addprefix $(INSTALL_WWWDIR)/apt/, $(ALLAPTUI)) \
$(addprefix $(INSTALL_WWWDIR)/apt/formhelpers/css/, $(ALLHELPCSS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/formhelpers/js/, $(ALLHELPJS))
pnet-install: $(addprefix $(INSTALL_WWWDIR)/pnet/, $(ALLPNET))
post-install:
......@@ -319,16 +313,6 @@ $(INSTALL_WWWDIR)/aptb/%: aptuib/%
-mkdir -p $(patsubst %/,%,$(dir $@))
$(INSTALL_DATA) $(subst $$,\$$,$<) $(subst $$,\$$,$@)
$(INSTALL_WWWDIR)/pnet/%.html: pnet/%.html htmlinstall
@echo "Installing $<"
-mkdir -p $(patsubst %/,%,$(dir $@))
$(HTMLINSTALL) $(subst $$,\$$,$<) $(subst $$,\$$,$@)
$(INSTALL_WWWDIR)/pnet/%: pnet/%
@echo "Installing $<"
-mkdir -p $(patsubst %/,%,$(dir $@))
$(INSTALL_DATA) $(subst $$,\$$,$<) $(subst $$,\$$,$@)
$(INSTALL_DIR)/opsdir/www/%.html: %.html htmlinstall
@echo "Installing $<"
-mkdir -p $(patsubst %/,%,$(dir $@))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment