swc

commit eaa62c1dadbffae5a4c31760f804fa91a1b37f4c
parent 34c1d5d189b5e79378d5a8253374bafeab99c33f
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 22 Nov 2014 21:06:07 +0000

Makefile: Leave directory quoting to the user

Diffstat:
M
Makefile
 | 
4
++--
M
launch/local.mk
 | 
2
+-
M
libswc/local.mk
 | 
10
+++++-----
M
protocol/local.mk
 | 
4
++--

4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
@@ -98,7 +98,7 @@ link      = $(Q_CCLD)$(CC) $(LDFLAGS) -o $@ $^
 include $(SUBDIRS:%=%/local.mk)
 
 $(foreach dir,BIN LIB INCLUDE PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DESTDIR)$(DATADIR)/swc:
-	mkdir -p "$@"
+	mkdir -p $@
 
 .PHONY: build
 build: $(SUBDIRS:%=build-%) $(TARGETS)
@@ -112,7 +112,7 @@ swc.pc: swc.pc.in
 
 .PHONY: install-swc.pc
 install-swc.pc: swc.pc | $(DESTDIR)$(PKGCONFIGDIR)
-	install -m0644 $< "$(DESTDIR)$(PKGCONFIGDIR)"
+	install -m 644 $< $(DESTDIR)$(PKGCONFIGDIR)
 
 .PHONY: install
 install: $(SUBDIRS:%=install-%) $(TARGETS:%=install-%)
diff --git a/launch/local.mk b/launch/local.mk
@@ -9,7 +9,7 @@ $(dir)/swc-launch: $(dir)/launch.o $(dir)/protocol.o
 	$(link) $(launch_PACKAGE_LIBS)
 
 install-$(dir): $(dir)/swc-launch | $(DESTDIR)$(BINDIR)
-	install -m4755 launch/swc-launch "$(DESTDIR)$(BINDIR)"
+	install -m 4755 launch/swc-launch $(DESTDIR)$(BINDIR)
 
 CLEAN_FILES += $(dir)/launch.o
 
diff --git a/libswc/local.mk b/libswc/local.mk
@@ -103,18 +103,18 @@ $(dir)/$(LIBSWC_LINK): $(dir)/$(LIBSWC_SO)
 
 .PHONY: install-libswc.a
 install-libswc.a: $(dir)/libswc.a | $(DESTDIR)$(LIBDIR)
-	install -m0644 $< "$(DESTDIR)$(LIBDIR)"
+	install -m 644 $< $(DESTDIR)$(LIBDIR)
 
 .PHONY: install-$(LIBSWC_LIB)
 install-$(LIBSWC_LIB): $(dir)/$(LIBSWC_LIB) | $(DESTDIR)$(LIBDIR)
-	install -m0755 $< "$(DESTDIR)$(LIBDIR)"
+	install -m 755 $< $(DESTDIR)$(LIBDIR)
 
 .PHONY: install-$(LIBSWC_SO) install-$(LIBSWC_LINK)
 install-$(LIBSWC_SO) install-$(LIBSWC_LINK): install-$(LIBSWC_LIB)
-	ln -sf $(LIBSWC_LIB) "$(DESTDIR)$(LIBDIR)"/${@:install-%=%}
+	ln -sf $(LIBSWC_LIB) $(DESTDIR)$(LIBDIR)/${@:install-%=%}
 
-install-libswc: $($(dir)_TARGETS:$(dir)/%=install-%) | $(DESTDIR)$(INCLUDEDIR)
-	install -m0644 libswc/swc.h "$(DESTDIR)$(INCLUDEDIR)"
+install-$(dir): $($(dir)_TARGETS:$(dir)/%=install-%) | $(DESTDIR)$(INCLUDEDIR)
+	install -m 644 libswc/swc.h $(DESTDIR)$(INCLUDEDIR)
 
 CLEAN_FILES += $(SWC_SHARED_OBJECTS) $(SWC_STATIC_OBJECTS)
 
diff --git a/protocol/local.mk b/protocol/local.mk
@@ -17,8 +17,8 @@ $(dir)/%-protocol.c: $(dir)/%.xml
 $(dir)/%-server-protocol.h: $(dir)/%.xml
 	$(Q_GEN)$(WAYLAND_SCANNER) server-header <$< >$@
 
-install-protocol: | $(DESTDIR)$(DATADIR)/swc
-	install -m0644 protocol/swc.xml "$(DESTDIR)$(DATADIR)/swc"
+install-$(dir): | $(DESTDIR)$(DATADIR)/swc
+	install -m 644 protocol/swc.xml $(DESTDIR)$(DATADIR)/swc
 
 include common.mk