From 2f570c9fab30a41767b20607bb3e01d102f12fec Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 14 Mar 2013 17:57:26 +0100
Subject: [PATCH] rpm packaging rudimentary but OK

---
 Makefile | 20 +++++++++++---------
 setup.py |  4 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c33b594c..f40c1db5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+MAKE-SILENT = $(MAKE) --no-print-directory
+
 ### first purpose, build and install from the specfile
 all: build
 
@@ -26,7 +28,7 @@ myfiles: force
 
 # in general it's right to rely on the contents as reported by git
 tags: force
-	$(MAKE) myfiles | xargs etags
+	$(MAKE-SILENT) myfiles | xargs etags
 
 # however sometimes we have stuff not yet added, so in this case
 ftags: force
@@ -71,12 +73,12 @@ list-templates: force
 #################### manage static contents (extract from all the modules into the single all-static location)
 static run-static static-run: force
 	mkdir -p ./all-static/js all-static/css all-static/img
-	ln -sf $(foreach x,$(shell $(MAKE) list-js),../../$(x)) ./all-static/js
-	ln -sf $(foreach x,$(shell $(MAKE) list-css),../../$(x)) ./all-static/css
-	ln -sf $(foreach x,$(shell $(MAKE) list-img),../../$(x)) ./all-static/img
-#	rsync -av $(shell $(MAKE) list-js) ./all-static/js
-#	rsync -av $(shell $(MAKE) list-css) ./all-static/css
-#	rsync -av $(shell $(MAKE) list-img) ./all-static/img
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-js),../../$(x)) ./all-static/js
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-css),../../$(x)) ./all-static/css
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-img),../../$(x)) ./all-static/img
+#	rsync -av $(shell $(MAKE-SILENT) list-js) ./all-static/js
+#	rsync -av $(shell $(MAKE-SILENT) list-css) ./all-static/css
+#	rsync -av $(shell $(MAKE-SILENT) list-img) ./all-static/img
 
 clean-static static-clean: force
 	rm -rf ./all-static
@@ -86,8 +88,8 @@ all-static: clean-static run-static
 #################### manage templates for the plugin area
 templates run-templates templates-run: force
 	mkdir -p all-templates
-	ln -sf $(foreach x,$(shell $(MAKE) list-templates),../$(x)) ./all-templates
-#	rsync -av $(shell $(MAKE) list-templates) ./all-templates
+	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./all-templates
+#	rsync -av $(shell $(MAKE-SILENT) list-templates) ./all-templates
 
 clean-templates templates-clean: force
 	rm -rf ./all-templates
diff --git a/setup.py b/setup.py
index a45105be..2eeb598c 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,8 @@ packages= [ os.path.dirname(init) for init in (glob("*/__init__.py")+glob("*/*/_
 setup(packages = packages,
       scripts = [],
       data_files = [ 
-        ( 'all-static', glob ('all-static/*')),
+        ( 'all-static/js', glob ('all-static/js/*')),
+        ( 'all-static/css', glob ('all-static/css/*')),
+        ( 'all-static/img', glob ('all-static/img/*')),
         ( 'all-templates', glob ('all-templates/*')),
         ])
-- 
2.43.0