Fix Makefile

Makefile

@@ -1,41 +1,44 @@
-TARGETS := all
-#SUBDIRS := $(wildcard */.)
-SUBDIRS = src src/contrib
-SUBDIRGOALS := all
-SUBDIRSCLEAN=$(addsuffix -clean,$(SUBDIRS))
-
-STRIP ?= strip
+STRIP   ?= strip
 DESTDIR ?= dist
-
-all: install
-
-$(TARGETS): $(SUBDIRS)
-
-$(SUBDIRS):
-	$(MAKE) -C $@ $(SUBDIRGOALS)
+INSTALL ?= install
+
+SUBDIRS := $(sort $(dir $(wildcard   */Makefile))) \
+           $(sort $(dir $(wildcard */*/Makefile)))
+
+%-all: %
+	$(MAKE) -C $<
+
+all: $(addsuffix -all,$(SUBDIRS))
+
+install-bin: all
+	$(INSTALL) -m 755 -d    $(DESTDIR)/usr/bin
+	$(INSTALL) -m 755       src/radangel $(DESTDIR)/usr/bin
+	$(INSTALL) -m 755       src/contrib/websockify $(DESTDIR)/usr/bin
+	$(STRIP)   -s           $(DESTDIR)/usr/bin/radangel
+	$(STRIP)   -s           $(DESTDIR)/usr/bin/websockify
+
+install-html:
+	$(INSTALL) -m 755 -d    $(DESTDIR)/usr/share/radangel/html
+	$(INSTALL) -m 644       html/index.html $(DESTDIR)/usr/share/radangel/html
+	$(INSTALL) -m 755 -d    $(DESTDIR)/usr/share/radangel/html/js
+	$(INSTALL) -m 644       html/js/streamplot.js $(DESTDIR)/usr/share/radangel/html/js
+	$(INSTALL) -m 644       html/js/chroma.min.js $(DESTDIR)/usr/share/radangel/html/js
+	$(INSTALL) -m 644       html/js/plotly-cartesian-latest.min.js $(DESTDIR)/usr/share/radangel/html/js
+
+install-config:
+	$(INSTALL) -m 755 -d    $(DESTDIR)/lib/systemd/system
+	$(INSTALL) -m 644       service/datasrc.service $(DESTDIR)/lib/systemd/system
+	$(INSTALL) -m 644       service/radangel.service $(DESTDIR)/lib/systemd/system
+	$(INSTALL) -m 644       service/websockify.service $(DESTDIR)/lib/systemd/system
+	$(INSTALL) -m 755 -d    $(DESTDIR)/etc/nginx/conf.d
+	$(INSTALL) -m 644       config/nginx-default-datasrc-location.conf $(DESTDIR)/etc/nginx/conf.d
+	$(INSTALL) -m 755 -d    $(DESTDIR)/etc/udev/rules.d
+	$(INSTALL) -m 644       config/60-kromek-radangel.rules $(DESTDIR)/etc/udev/rules.d
+
+install: install-bin install-html install-config
 
 %-clean: %
 	$(MAKE) -C $< clean
 
-install: $(SUBDIRS)
-	mkdir -p $(DESTDIR)/opt/radangel
-	cp -p src/radangel $(DESTDIR)/opt/radangel/radangel
-	$(STRIP) -s $(DESTDIR)/opt/radangel/radangel
-	mkdir -p $(DESTDIR)/opt/websockify
-	cp -p src/contrib/websockify $(DESTDIR)/opt/websockify/websockify
-	$(STRIP) -s $(DESTDIR)/opt/websockify/websockify
-	mkdir -p $(DESTDIR)/etc/systemd/system
-	cp -p service/*.service $(DESTDIR)/etc/systemd/system/
-	mkdir -p $(DESTDIR)/var/www/html/gamma
-	cp -rp html/. $(DESTDIR)/var/www/html/gamma/
-	mkdir -p $(DESTDIR)/etc/nginx/sites-available
-	cp -p config/nginx*.conf $(DESTDIR)/etc/nginx/sites-available/
-	mkdir -p $(DESTDIR)/etc/udev/rules.d
-	cp -p config/*.rules $(DESTDIR)/etc/udev/rules.d/
-
-dist-clean:
-	rm -rf dist
-
-clean: $(SUBDIRSCLEAN) dist-clean
-
-.PHONY: $(TARGETS) $(SUBDIRS)
+clean: $(addsuffix -clean,$(SUBDIRS))
+	rm -rf $(DESTDIR)