summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Blake Kongslie <jblake@omgwallhack.org>2011-01-09 16:16:52 -0800
committerJulian Blake Kongslie <jblake@omgwallhack.org>2011-01-09 16:16:52 -0800
commite1ffec68d09d9fce74e9c05d159edca5222cdeab (patch)
tree72c14bb53e15b77fc8f4c1e7047b54caa945d050
parent37027f54f3583e167dfca4b304cdc0f392465fd2 (diff)
parent0603e84c9af78b5e6d76db66d45934819e9f6d3b (diff)
downloadpiny-code-e1ffec68d09d9fce74e9c05d159edca5222cdeab.tar.gz
piny-code-e1ffec68d09d9fce74e9c05d159edca5222cdeab.zip
Merge branch 'master' of ssh://piny/srv/git/piny-code
-rw-r--r--pinyweb/Makefile4
-rw-r--r--[-rwxr-xr-x]pinyweb/cgi-bin/piny-newuser.cgi (renamed from pinyweb/cgi-bin/newuser.cgi)0
-rwxr-xr-xpinyweb/cgi-bin/piny/newrepo.cgi (renamed from pinyweb/cgi-bin/newrepo.cgi)0
3 files changed, 2 insertions, 2 deletions
diff --git a/pinyweb/Makefile b/pinyweb/Makefile
index bf6e865..622f24c 100644
--- a/pinyweb/Makefile
+++ b/pinyweb/Makefile
@@ -2,8 +2,8 @@ build:
$(MAKE) -C suid
install:
- install -o root -g root -m 755 -d $(DESTDIR)/usr/lib/cgi-bin/piny $(DESTDIR)/usr/sbin
- install -o root -g root -m 755 cgi-bin/* $(DESTDIR)/usr/lib/cgi-bin/piny
+ install -o root -g root -m 755 -d $(DESTDIR)/usr/lib/cgi-bin $(DESTDIR)/usr/sbin
+ install -o root -g root -m 755 cgi-bin/* $(DESTDIR)/usr/lib/cgi-bin
install -o root -g www-data -m 4754 suid/piny-suid $(DESTDIR)/usr/sbin
clean:
diff --git a/pinyweb/cgi-bin/newuser.cgi b/pinyweb/cgi-bin/piny-newuser.cgi
index 002d2be..002d2be 100755..100644
--- a/pinyweb/cgi-bin/newuser.cgi
+++ b/pinyweb/cgi-bin/piny-newuser.cgi
diff --git a/pinyweb/cgi-bin/newrepo.cgi b/pinyweb/cgi-bin/piny/newrepo.cgi
index 450fa82..450fa82 100755
--- a/pinyweb/cgi-bin/newrepo.cgi
+++ b/pinyweb/cgi-bin/piny/newrepo.cgi