diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-14 23:42:04 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-14 23:42:04 +0000 |
| commit | b2acee4d442f02277c6aa7b2ee9384526bb3072d (patch) | |
| tree | 5d9c4d68d98ee8ba36dba042bd1e6bf91c4d1e7e | |
| parent | 87338709de6c7643acc6f9b689052b4cd3df3bbc (diff) | |
There are no longer any user configurable options in settings.py, so always install the generated copy. This avoids the user needing to manually copy it.
svn path=/trunk/; revision=4867
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index d4b7c5dc..f4dbcb60 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -46,13 +46,7 @@ install: $(BUILD) ${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 ${SYSCONFDIR}/settings.py ]; then \ - ${INSTALL} -m 644 settings.py ${SYSCONFDIR}; \ - else \ - echo "${SYSCONFDIR}/settings.py already exists, installing settings.py as ${SYSCONFDIR}/settings.py.new"; \ - ${INSTALL} -m 644 settings.py ${SYSCONFDIR}/settings.py.new; \ - fi + ${INSTALL} -m 644 settings.py ${SYSCONFDIR} deinstall uninstall: rm -rf $(INSTDIR) |