diff options
| -rw-r--r-- | extra/Makefile | 14 | ||||
| -rw-r--r-- | extra/fifconfig.spec | 6 |
2 files changed, 4 insertions, 16 deletions
diff --git a/extra/Makefile b/extra/Makefile index 6106c24..361c246 100644 --- a/extra/Makefile +++ b/extra/Makefile @@ -23,7 +23,6 @@ DEFAULTDIR = $(DESTDIR)/etc/sysconfig# for debian use '$(DESTDIR)/etc/default' LIBEXECDIR = $(DESTDIR)$(prefix)/libexec SHAREDIR = $(DESTDIR)$(prefix)/share DOCDIR = $(SHAREDIR)/doc/$(APPNAME) -APPDIR = $(SHAREDIR)/$(APPNAME) APPVARDIR = $(DESTDIR)/var/$(APPNAME) MANDIR = $(SHAREDIR)/man SYSVDIR = $(SYSCONFDIR)/init.d @@ -83,15 +82,13 @@ deplist_opts: @${grepbin} -h -o -riIE '\<(dep|rec|sug)-[^\ :]+:' ${SRCDIR} | ${sedbin} -r -e 's/(dep|rec|sug)-//;' -e 's/:$$//;' | ${sortbin} | ${uniqbin} 1>&2 install_files: - ${installbin} -m0755 -d ${LOGDIR} ${APPVARDIR} ${APPDIR}/static ${APPDIR}/templates \ + ${installbin} -m0755 -d ${LOGDIR} ${APPVARDIR} \ ${DOCDIR} ${SBINDIR} ${SYSCONFDIR} ${LIBEXECDIR}/${APPNAME} ${installbin} -m0755 -t ${SBINDIR} ${SRCDIR}/${APPNAME}.bin - ${installbin} -m0644 -t ${LIBEXECDIR}/${APPNAME} ${SRCDIR}/${APPNAME}.py ${SRCDIR}/${APPNAME}_auth.py + ${installbin} -m0644 -t ${LIBEXECDIR}/${APPNAME} ${SRCDIR}/${APPNAME}.py ${installbin} -m0644 ${SRCDIR}/${APPNAME}.conf.example ${SYSCONFDIR}/${APPNAME}.conf ${installbin} -m0644 ${SRCDIR}/${APPNAME}.wsgi.ini.example ${SYSCONFDIR}/${APPNAME}.wsgi.ini ${installbin} -m0644 -t ${DOCDIR} ${SRCDIR}/*.md - ${installbin} -m0644 -t ${APPDIR}/static ${SRCDIR}/static/* - ${installbin} -m0644 -t ${APPDIR}/templates ${SRCDIR}/templates/* ifeq ($(with_apache),YES) ${installbin} -m0755 -d ${APACHEDIR} ${installbin} -m0644 ${SRCDIR}/extra/${APPNAME}.conf.apache ${APACHEDIR}/${APPNAME}.conf @@ -114,10 +111,8 @@ endif uninstall: @${echobin} SRCDIR=${SRCDIR} - ${rmbin} -f ${APPDIR}/${APPNAME}.* \ + ${rmbin} -f \ ${DOCDIR}/* \ - ${APPDIR}/static/* \ - ${APPDIR}/templates/* \ ${LIBEXECDIR}/${APPNAME}/* \ ${SBINDIR}/${APPNAME}.bin \ 1>/dev/null 2>&1 || : @@ -125,10 +120,9 @@ uninstall: ${rmbin} -f ${SYSVDIR}/${APPNAME} || : # remove all installed directories that are now blank. - ${rmdirbin} ${APPVARDIR} ${APPDIR}/static \ + ${rmdirbin} ${APPVARDIR} \ ${SYSVDIR} ${APACHEDIR} ${DOCDIR} \ ${LIBEXECDIR}/${APPNAME} ${LOGDIR} 2>/dev/null || : - ${rmdirbin} ${APPDIR} 2>/dev/null || : clean: -@${echobin} "target $@ not implemented yet! Gotta say unh." && ${falsebin} diff --git a/extra/fifconfig.spec b/extra/fifconfig.spec index 3819a8b..eb678b0 100644 --- a/extra/fifconfig.spec +++ b/extra/fifconfig.spec @@ -25,7 +25,6 @@ %endif %global _appvardir %{?_localstatedir}%{!?_localstatedir:/var}/fifconfig -%global _appdir %{?_datarootdir}%{!?_datarootdir:%{_prefix}/share}/fifconfig %global _user fifconfig %define devtty "/dev/null" @@ -137,11 +136,6 @@ exit 0 %attr(0640, %{_user}, %{_user}) %config(noreplace) %{_sysconfdir}/%{name}.wsgi.ini %attr(0640, %{_user}, %{_user}) %{_libexecdir}/%{name}/*.py %attr(0755, %{_user}, %{_user}) %{_sbindir}/%{name}.bin -%attr(0644, %{_user}, %{_user}) %{_appdir}/static/* -%attr(0644, %{_user}, %{_user}) %{_appdir}/templates/* -%attr(0755, %{_user}, %{_user}) %dir %{_appdir}/static -%attr(0755, %{_user}, %{_user}) %dir %{_appdir}/templates -%attr(0755, %{_user}, %{_user}) %dir %{_appdir} %attr(0750, %{_user}, %{_user}) %dir %{_appvardir} %if ! 0%{?fedora} %attr(0755, -, -) %{_libexecdir}/%{name}/pip-helper.sh |