diff options
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 11 | ||||
| -rw-r--r-- | rpkid/setup.py | 46 |
2 files changed, 20 insertions, 37 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 53e7f0c8..ba206f5c 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -44,17 +44,6 @@ apache.conf: $(srcdir)/apache.conf.in Makefile $(edit) $@.in > $@ install: all - if test -d $(INSTDIR)/wsgi; then :; else ${INSTALL} -d $(INSTDIR)/wsgi; fi - if test -d $(INSTDIR)/media; then :; else ${INSTALL} -d $(INSTDIR)/media; fi - if test -d $(INSTDIR)/media/css; then :; else ${INSTALL} -d $(INSTDIR)/media/css; fi - if test -d $(INSTDIR)/media/img; then :; else ${INSTALL} -d $(INSTDIR)/media/img; fi - if test -d $(INSTDIR)/media/js; then :; else ${INSTALL} -d $(INSTDIR)/media/js; fi - ${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi/rpki.wsgi - # this would be better handled with "django-admin collectstatic" but makes the install - # process harder for the end user. - ${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/css/* $(INSTDIR)/media/css - ${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/js/* $(INSTDIR)/media/js - ${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/img/* $(INSTDIR)/media/img deinstall uninstall: rm -rf $(INSTDIR)/media $(INSTDIR)/wsgi diff --git a/rpkid/setup.py b/rpkid/setup.py index ad960876..7ddd8c02 100644 --- a/rpkid/setup.py +++ b/rpkid/setup.py @@ -15,32 +15,17 @@ # PERFORMANCE OF THIS SOFTWARE. from distutils.core import setup, Extension +from glob import glob import setup_extensions -import os try: - # Import settings derived from autoconf tests and configuration. - # import setup_autoconf as autoconf - ac_cflags = autoconf.CFLAGS.split() - ac_ldflags = autoconf.LDFLAGS.split() - ac_libs = autoconf.LIBS.split() - ac_sbindir = autoconf.sbindir - ac_libexecdir = autoconf.libexecdir - ac_datarootdir = os.path.join(autoconf.datarootdir, "rpki") - ac_sysconfdir = os.path.join(autoconf.sysconfdir, "rpki") except ImportError: - # We can't build POW without the autoconf settings, but we allow them - # to be absent when running things like "python setup.py --help". - # - ac_cflags = () - ac_ldflags = () - ac_libs = () - ac_sbindir = None - ac_libexecdir = None - ac_datarootdir = None - ac_sysconfdir = None + # We can't build or install without the autoconf settings, but this + # allows things like "python setup.py --help" to work. + class autoconf: + sbindir = libexecdir = datarootdir = sysconfdir = CFLAGS = LDFLAGS = LIBS = "" # pylint: disable=W0622 @@ -60,15 +45,16 @@ setup(name = "rpkitoolkit", "rpki.gui.api", "rpki.gui.routeview"], ext_modules = [Extension("rpki.POW._POW", ["ext/POW.c"], - extra_compile_args = ac_cflags, - extra_link_args = ac_ldflags + ac_libs)], + extra_compile_args = autoconf.CFLAGS.split(), + extra_link_args = (autoconf.LDFLAGS + " " + + autoconf.LIBS).split())], package_data = {"rpki.gui.app" : ["migrations/*.py", "static/*/*", "templates/*.html", "templates/*/*.html", "templatetags/*.py"], "rpki.gui.cacheview" : ["templates/*/*.html"]}, - scripts = [(ac_sbindir, + scripts = [(autoconf.sbindir, ["rpkic", "rpki-confgen", "rpki-start-servers", @@ -76,7 +62,7 @@ setup(name = "rpkitoolkit", "rpki-sql-setup", "portal-gui/scripts/rpki-manage", "irbe_cli"]), - (ac_libexecdir, + (autoconf.libexecdir, ["irdbd", "pubd", "rootd", @@ -84,6 +70,14 @@ setup(name = "rpkitoolkit", "portal-gui/scripts/rpkigui-import-routes", "portal-gui/scripts/rpkigui-check-expired", "portal-gui/scripts/rpkigui-rcynic"])], - data_files = [(ac_sysconfdir, + data_files = [(autoconf.sysconfdir + "/rpki", ["portal-gui/apache.conf", - "rpki-confgen.xml"])]) + "rpki-confgen.xml"]), + (autoconf.datarootdir + "/rpki/wsgi", + ["portal-gui/rpki.wsgi"]), + (autoconf.datarootdir + "/rpki/media/css", + glob("rpki/gui/app/static/css/*")), + (autoconf.datarootdir + "/rpki/media/js", + glob("rpki/gui/app/static/js/*")), + (autoconf.datarootdir + "/rpki/media/img", + glob("rpki/gui/app/static/img/*"))]) |