From 080300de7fd944a51178e3916489438a60b5f752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 10 Nov 2014 13:37:57 +0100
Subject: [PATCH] build: adapt to merge of wcs themes (#5917)

---
 Makefile     |  9 ++++++++-
 wcs/Makefile | 41 -----------------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 wcs/Makefile

diff --git a/Makefile b/Makefile
index 87d9044..c65f3ea 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,12 @@ NAME="montpellier-themes"
 prefix = /usr
 
 all:
-	@(echo "Nothing to build. Please use make install.")
+	(cd wcs/montpellier2 && msgfmt -o fr.mo fr.po)
+	(cd wcs/montpellier-commune && msgfmt -o fr.mo fr.po)
 
 clean:
+	rm -f wcs/montpellier2/fr.mo
+	rm -f wcs/montpellier-commune/fr.mo
 	rm -rf build sdist
 
 build: clean
@@ -20,8 +23,12 @@ build: clean
 install:
 	mkdir -p $(DESTDIR)$(prefix)/share/authentic2/montpellier
 	mkdir -p $(DESTDIR)$(prefix)/share/portail-citoyen2/montpellier
+	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2
+	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier-commune
 	cp -r idp/* $(DESTDIR)$(prefix)/share/authentic2/montpellier
 	cp -r portail-citoyen/* $(DESTDIR)$(prefix)/share/portail-citoyen2/montpellier
+	cp -ar wcs/montpellier2/* $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2/
+	cp -ar wcs/montpellier-commune/* $(DESTDIR)$(prefix)/share/wcs/themes/montpellier-commune/
 
 dist-bzip2: build
 	mkdir sdist
diff --git a/wcs/Makefile b/wcs/Makefile
deleted file mode 100644
index ee8594f..0000000
--- a/wcs/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-VERSION=`git describe`
-NAME="montpellier-themes-wcs"
-
-prefix = /usr
-
-all:
-	(cd montpellier2 && msgfmt -o fr.mo fr.po)
-	(cd montpellier-commune && msgfmt -o fr.mo fr.po)
-
-clean:
-	rm -f montpellier2/fr.mo
-	rm -f montpellier-commune/fr.mo
-	rm -rf build sdist
-
-build: clean
-	mkdir -p build/$(NAME)-$(VERSION)
-	for i in *; do \
-		if [ "$$i" != "build" ]; then \
-			cp -R "$$i" build/$(NAME)-$(VERSION); \
-		fi; \
-	done
-
-install: all
-	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2
-	mkdir -p $(DESTDIR)$(prefix)/share/wcs/themes/montpellier-commune
-	cp -ar montpellier2/* $(DESTDIR)$(prefix)/share/wcs/themes/montpellier2/
-	cp -ar montpellier-commune/* $(DESTDIR)$(prefix)/share/wcs/themes/montpellier-commune/
-
-dist-bzip2: build
-	mkdir sdist
-	cd build && tar cfj ../sdist/$(NAME)-$(VERSION).tar.bz2 .
-
-version:
-	@(echo $(VERSION))
-
-name:
-	@(echo $(NAME))
-
-fullname:
-	@(echo $(NAME)-$(VERSION))
-