1 files changed, 16 insertions, 40 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index fa4e1e46..d4b7c5dc 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -16,21 +16,13 @@ sbindir=@sbindir@
 libexecdir=@libexecdir@
 sysconfdir=@sysconfdir@
 
-WEBUSER=@WEBUSER@
-DJANGO_ADMIN=@DJANGO_ADMIN@
-PYTHON=@PYTHON@
-DJANGO_DIR=@DJANGO_DIR@
-
 INSTALL = @INSTALL@
 
-CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf
-DATABASE_PATH=${DESTDIR}$(localstatedir)/rpki/gui.db
-INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui
-STATIC_DIR=${INSTDIR}/static
-PYTHONPATH=${DESTDIR}${sysconfdir}/rpki
+INSTDIR=${DESTDIR}$(datarootdir)/rpki
+SYSCONFDIR=${DESTDIR}${sysconfdir}/rpki
 
 # automatically built sources
-BUILD=apache/rpki.conf
+BUILD=apache.conf
 
 all: $(BUILD)
 
@@ -42,41 +34,25 @@ distclean: clean
 	rm -f Makefile
 
 edit = sed \
-	-e 's|@DJANGO_DIR[@]|$(DJANGO_DIR)|g' \
-	     -e 's|@INSTDIR[@]|$(INSTDIR)|g' \
-	     -e 's|@STATIC_DIR[@]|$(STATIC_DIR)|g'
+	     -e 's|@INSTDIR[@]|$(INSTDIR)|g'
 
-apache/rpki.conf: $(srcdir)/apache/rpki.conf.in Makefile
+apache.conf: $(srcdir)/apache.conf.in Makefile
 	$(edit) $@.in > $@
 
-.PHONY: install-perms install-data install
-
-install-perms:
-	chown $(WEBUSER) `dirname $(DATABASE_PATH)`
-	chown $(WEBUSER) $(DATABASE_PATH)
-	mkdir -p $(CONFDIR)
-	chown -R $(WEBUSER) $(CONFDIR)
-
-install-apache:
-	${INSTALL} -d -m 755 $(INSTDIR)/apache
-	${INSTALL} -m 644 apache/rpki.conf $(INSTDIR)/apache
-	${INSTALL} -m 644 apache/rpki.wsgi $(INSTDIR)/apache
-
-install-data: $(BUILD) install-apache
-	mkdir -p `dirname $(DATABASE_PATH)`
-	mkdir -p ${PYTHONPATH}
+install: $(BUILD)
+	${INSTALL} -d $(SYSCONFDIR)
+	${INSTALL} -d $(INSTDIR)/media/css
+	${INSTALL} -d $(INSTDIR)/wsgi
+	${INSTALL} -m 644 apache.conf $(SYSCONFDIR)/apache.conf
+	${INSTALL} -m 644 $(srcdir)/media/css/bootstrap.min.css $(INSTDIR)/media/css/bootstrap.min.css
+	${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi/rpki.wsgi
 	# FIXME should eventually try to merge new settings?
-	@if [ ! -f ${PYTHONPATH}/settings.py ]; then \
-	    ${INSTALL} -m 644 settings.py ${PYTHONPATH}; \
+	@if [ ! -f ${SYSCONFDIR}/settings.py ]; then \
+	    ${INSTALL} -m 644 settings.py ${SYSCONFDIR}; \
 	else \
-	    echo "${PYTHONPATH}/settings.py already exists, installing settings.py as ${PYTHONPATH}/settings.py.new"; \
-	    ${INSTALL} -m 644 settings.py ${PYTHONPATH}/settings.py.new; \
+	    echo "${SYSCONFDIR}/settings.py already exists, installing settings.py as ${SYSCONFDIR}/settings.py.new"; \
+	    ${INSTALL} -m 644 settings.py ${SYSCONFDIR}/settings.py.new; \
 	fi
-	$(DJANGO_ADMIN) syncdb --pythonpath ${PYTHONPATH} --settings settings
-	#$(DJANGO_ADMIN) collectstatic --noinput --pythonpath ${PYTHONPATH} --settings settings
-	if [ ! -f $(INSTDIR)/rpki.conf.template ]; then ${INSTALL} -m 644 ../examples/rpki.conf $(INSTDIR)/rpki.conf.template; fi
-
-install: install-data install-perms
 
 deinstall uninstall:
 	rm -rf $(INSTDIR)