summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMS <ms@taler.net>2021-05-28 22:50:32 +0200
committerMS <ms@taler.net>2021-05-28 22:50:32 +0200
commit968fa4607bdcf332df58ddadc51b0811b7d2d706 (patch)
tree65dee278376bf6e5bf4500b92b49b495604bcd1c
parent5ae85729ba8bbe4a17f7187e43ec1584ad2baa86 (diff)
downloadmerchant-968fa4607bdcf332df58ddadc51b0811b7d2d706.tar.gz
merchant-968fa4607bdcf332df58ddadc51b0811b7d2d706.tar.bz2
merchant-968fa4607bdcf332df58ddadc51b0811b7d2d706.zip
importing the backoffice SPA
-rwxr-xr-xbootstrap11
-rw-r--r--contrib/Makefile.am9
2 files changed, 8 insertions, 12 deletions
diff --git a/bootstrap b/bootstrap
index 6766d092..06262259 100755
--- a/bootstrap
+++ b/bootstrap
@@ -32,12 +32,9 @@ fi
echo "$0: Running autoreconf"
autoreconf -if
-#echo "Building single-page app (from external Git repository)"
-#cd contrib/merchant-backoffice
-#./bootstrap
-#./configure
-#make build-single
-#cp packages/frontend/single/index.html ../spa.html
-#cd ../..
+echo "Importing single-page app (from external Git repository)"
+cd contrib/merchant-backoffice
+cp spa.html ..
+cd ../..
exit 0
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ffdcfd12..4344aac7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ dist_staticpkgdata_DATA = \
pure-min.css
-# spa.html is the single-page-app generated from the merchant-backoffice.git,
-# 'make build-single', during 'bootstrap!'
-# FIXME: temporarily disabled.
-# dist_spapkgdata_DATA = \
-# spa.html
+# spa.html is the single-page-app imported from the merchant-backoffice.git
+# prebuilt branch.
+dist_spapkgdata_DATA = \
+ spa.html