aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--config.def.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3db5c01..3c57612 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ install:
mkdir -p $(DESTDIR)$(WWWPREFIX)/cgi-bin/l
install -Dm700 gpigeon.cgi $(DESTDIR)$(GPIGEON_PATH)
install -Dm600 link-tmpl.cgi $(DESTDIR)$(LINK_TEMPLATE_PATH)
- install -Dm644 index.html favicon.ico styles.css -t $(DESTDIR)$(WWWPREFIX)/
+ install -Dm644 index.html favicon.ico styles.css -t $(DESTDIR)$(WWWPREFIX)/gpigeon/
install -Dm755 merci/* -t $(DESTDIR)$(PREFIX)/merci/
@if test -e '$(WWWDOMAIN).conf'; then\
printf "\nInstalling $(WWWDOMAIN).conf into $(NGINXCONFDIR)\n";\
@@ -155,8 +155,8 @@ nginxconf: nginx-example.conf
uninstall:
- rm -rf $(DESTDIR)$(PREFIX)
- rm -rf $(DESTDIR)$(WWWPREFIX)
+ rm -rf $(DESTDIR)$(PREFIX)/gpigeon
+ rm -rf $(DESTDIR)$(WWWPREFIX)/gpigeon
clean:
rm -f genpass.txt gpg.txt link-tmpl.cgi gpigeon.cgi $(WWWDOMAIN).conf
diff --git a/config.def.mk b/config.def.mk
index c2f185a..7ff7d0c 100644
--- a/config.def.mk
+++ b/config.def.mk
@@ -5,7 +5,7 @@ PREFIX = /usr/share/gpigeon
COOKIES_DIR = $(PREFIX)/cookies
_GPG_HOMEDIR = $(PREFIX)/gnupg
LINK_TEMPLATE_PATH = $(PREFIX)/link-tmpl.cgi
-WWWPREFIX = /var/www/gpigeon
+WWWPREFIX = /var/www
GPIGEON_PATH = $(WWWPREFIX)/cgi-bin/gpigeon.cgi
# CGI tuning stuff