move portal-gui/scripts to rpkid/rpkid/gui/scripts

svn path=/portal-gui/Makefile.in; revision=3657

7 files changed, 23 insertions, 34 deletions

diff --git a/portal-gui/Makefile.in b/portal-gui/Makefile.in
index 9a4a2626..c5b45b21 100644
--- a/portal-gui/Makefile.in
+++ b/portal-gui/Makefile.in
@@ -25,11 +25,7 @@ INSTDIR=$(datarootdir)/rpki/gui
 TEMPLATEDIR=$(INSTDIR)/templates
 
 # automatically built sources
-BUILD=\
-	scripts/list_resources \
-	scripts/adduser \
-	scripts/load_csv \
-	apache/rpki.conf
+BUILD=apache/rpki.conf
 
 all: $(BUILD)
 
@@ -41,22 +37,12 @@ distclean: clean
 	rm -f Makefile
 
 edit = sed \
-	     -e 's|@PYTHON[@]|$(PYTHON)|g' \
-	     -e 's|@WEBUSER[@]|$(WEBUSER)|g'
+	     -e 's|@INSTDIR[@]|$(INSTDIR)|g'
 
 apache/rpki.conf: $(srcdir)/apache/rpki.conf.in Makefile
 	$(edit) $@.in > $@
 
-scripts/list_resources: $(srcdir)/scripts/list_resources.py Makefile
-	$(edit) $@.py > $@
-
-scripts/load_csv: $(srcdir)/scripts/load_csv.py Makefile
-	$(edit) $@.py > $@
-
-scripts/adduser: $(srcdir)/scripts/adduser.py Makefile
-	$(edit) $@.py > $@
-
-.PHONY: install-perms install-data install install-scripts install-templates
+.PHONY: install-perms install-data install install-templates
 
 install-perms:
 	chown $(WEBUSER) `dirname $(DATABASE_PATH)`
@@ -83,13 +69,7 @@ install-templates:
 	install -d -m 755 $(TEMPLATEDIR)/registration
 	install -m 644 templates/registration/login.html $(TEMPLATEDIR)/registration
 
-install-scripts:
-	# user scripts
-	install -m 755 scripts/load_csv $(sbindir)/rpkigui-load-csv
-	install -m 755 scripts/adduser $(sbindir)/rpkigui-add-user
-	install -D -m 755 scripts/list_resources $(libexecdir)/rpkigui-list-resources
-
-install-data: $(BUILD) install-apache install-templates install-scripts
+install-data: $(BUILD) install-apache install-templates
 	mkdir -p `dirname $(DATABASE_PATH)`
 	$(DJANGO_ADMIN) syncdb --settings rpki.gui.settings
 
@@ -97,9 +77,6 @@ install: install-data install-perms
 
 deinstall uninstall:
 	rm -r $(INSTDIR)
-	rm $(sbindir)/rpkigui-load-csv
-	rm $(sbindir)/rpkigui-add-user
-	rm $(libexecdir)/rpkigui-list-resources
 
 test:
 	@true
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 4502591a..ad7d91eb 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -33,13 +33,18 @@ SETUP_PY = \
 	AC_SBINDIR='${sbindir}' \
 	AC_SCRIPTS='${SCRIPTS}' \
 	AC_ABS_BUILDDIR='${abs_builddir}' \
+	AC_LIBEXECDIR='${libexecdir}' \
+	AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \
 	${PYTHON} setup.py
 
 POW_SO	= rpki/POW/_POW.so
 
-SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki pubd rootd rpkid
+SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd myrpki \
+	  pubd rootd rpkid rpki/gui/scripts/rpkigui-load-csv rpki/gui/scripts/rpkigui-add-user
 
-all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} rpki/gui/settings.py
+AUX_SCRIPTS = rpki/gui/scripts/rpkigui-list-resources
+
+all: ${POW_SO} rpki/relaxng.py myrpki.rng ${SCRIPTS} ${AUX_SCRIPTS} rpki/gui/settings.py
 
 ${POW_SO}: ext/POW.c setup.py
 	${SETUP_PY} build_ext --inplace
@@ -204,6 +209,15 @@ rootd: rootd.py
 rpkid: rpkid.py
 	${COMPILE_PYWRAP}
 
+rpki/gui/scripts/rpkigui-list-resources: rpki/gui/scripts/list_resources.py
+	${COMPILE_PYTHON}
+
+rpki/gui/scripts/rpkigui-load-csv: rpki/gui/scripts/list_resources.py
+	${COMPILE_PYTHON}
+
+rpki/gui/scripts/rpkigui-add-user: rpki/gui/scripts/adduser.py
+	${COMPILE_PYTHON}
+
 rpki/gui/settings.py: ${srcdir}/rpki/gui/settings.py.in
 	rm -f $@
 	${COMPILE_SETTINGS}
diff --git a/portal-gui/scripts/adduser.py b/rpkid/rpki/gui/scripts/adduser.py
index 20b395ea..8b475c0c 100644
--- a/portal-gui/scripts/adduser.py
+++ b/rpkid/rpki/gui/scripts/adduser.py
@@ -1,5 +1,3 @@
-#!@PYTHON@
-#
 # $Id$
 #
 # Copyright (C) 2010, 2011  SPARTA, Inc. dba Cobham Analytic Solutions
diff --git a/portal-gui/scripts/list_resources.py b/rpkid/rpki/gui/scripts/list_resources.py
index b425facc..77380505 100644
--- a/portal-gui/scripts/list_resources.py
+++ b/rpkid/rpki/gui/scripts/list_resources.py
@@ -1,4 +1,3 @@
-#!@PYTHON@
 # $Id$
 #
 # Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
diff --git a/portal-gui/scripts/load_csv.py b/rpkid/rpki/gui/scripts/load_csv.py
index f4738539..0ef49cce 100755
--- a/portal-gui/scripts/load_csv.py
+++ b/rpkid/rpki/gui/scripts/load_csv.py
@@ -1,4 +1,3 @@
-#!@PYTHON@
 # $Id$
 #
 # Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
diff --git a/portal-gui/scripts/roa_check.py b/rpkid/rpki/gui/scripts/roa_check.py
index c280d935..c280d935 100755
--- a/portal-gui/scripts/roa_check.py
+++ b/rpkid/rpki/gui/scripts/roa_check.py
diff --git a/rpkid/setup.py b/rpkid/setup.py
index 5bada734..4f6294fb 100644
--- a/rpkid/setup.py
+++ b/rpkid/setup.py
@@ -24,9 +24,11 @@ ac_cflags	= os.getenv("AC_CFLAGS",	"").split()
 ac_ldflags	= os.getenv("AC_LDFLAGS",	"").split()
 ac_libs		= os.getenv("AC_LIBS",		"").split()
 ac_scripts	= os.getenv("AC_SCRIPTS",	"").split()
+ac_aux_scripts  = os.getenv("AC_AUX_SCRIPTS",   "").split()
 
 ac_sbindir	= os.getenv("AC_SBINDIR",	"").strip()
 ac_abs_builddir = os.getenv("AC_ABS_BUILDDIR",	"").strip()
+ac_libexecdir   = os.getenv("AC_LIBEXECDIR",    "").strip()
 
 # Non-standard extension build specification: we need to force
 # whatever build options our top-level ./configure selected, and we
@@ -50,4 +52,4 @@ setup(name              = "rpkitoolkit",
       url               = "http://www.rpki.net/",
       packages          = ["rpki", "rpki.POW", "rpki.gui", "rpki.gui.app" ],
       ext_modules       = [pow],
-      data_files	= [(ac_sbindir, scripts)])
+      data_files	= [(ac_sbindir, scripts), (ac_libexecdir, ac_aux_scripts)])