commit eaa62c1

Michael Forney  ·  2014-11-22 21:06:07 +0000 UTC
parent 34c1d5d 
Makefile: Leave directory quoting to the user
4 files changed,  +10, -10
M Makefile
M launch/local.mk
M libswc/local.mk
M protocol/local.mk
M Makefile
+2, -2 
 1@@ -98,7 +98,7 @@ link      = $(Q_CCLD)$(CC) $(LDFLAGS) -o $@ $^
 2 include $(SUBDIRS:%=%/local.mk)
 3 
 4 $(foreach dir,BIN LIB INCLUDE PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DESTDIR)$(DATADIR)/swc:
 5-	mkdir -p "$@"
 6+	mkdir -p $@
 7 
 8 .PHONY: build
 9 build: $(SUBDIRS:%=build-%) $(TARGETS)
10@@ -112,7 +112,7 @@ swc.pc: swc.pc.in
11 
12 .PHONY: install-swc.pc
13 install-swc.pc: swc.pc | $(DESTDIR)$(PKGCONFIGDIR)
14-	install -m0644 $< "$(DESTDIR)$(PKGCONFIGDIR)"
15+	install -m 644 $< $(DESTDIR)$(PKGCONFIGDIR)
16 
17 .PHONY: install
18 install: $(SUBDIRS:%=install-%) $(TARGETS:%=install-%)
M launch/local.mk
+1, -1 
1@@ -9,7 +9,7 @@ $(dir)/swc-launch: $(dir)/launch.o $(dir)/protocol.o
2 	$(link) $(launch_PACKAGE_LIBS)
3 
4 install-$(dir): $(dir)/swc-launch | $(DESTDIR)$(BINDIR)
5-	install -m4755 launch/swc-launch "$(DESTDIR)$(BINDIR)"
6+	install -m 4755 launch/swc-launch $(DESTDIR)$(BINDIR)
7 
8 CLEAN_FILES += $(dir)/launch.o
9
M libswc/local.mk
+5, -5 
 1@@ -103,18 +103,18 @@ $(dir)/$(LIBSWC_LINK): $(dir)/$(LIBSWC_SO)
 2 
 3 .PHONY: install-libswc.a
 4 install-libswc.a: $(dir)/libswc.a | $(DESTDIR)$(LIBDIR)
 5-	install -m0644 $< "$(DESTDIR)$(LIBDIR)"
 6+	install -m 644 $< $(DESTDIR)$(LIBDIR)
 7 
 8 .PHONY: install-$(LIBSWC_LIB)
 9 install-$(LIBSWC_LIB): $(dir)/$(LIBSWC_LIB) | $(DESTDIR)$(LIBDIR)
10-	install -m0755 $< "$(DESTDIR)$(LIBDIR)"
11+	install -m 755 $< $(DESTDIR)$(LIBDIR)
12 
13 .PHONY: install-$(LIBSWC_SO) install-$(LIBSWC_LINK)
14 install-$(LIBSWC_SO) install-$(LIBSWC_LINK): install-$(LIBSWC_LIB)
15-	ln -sf $(LIBSWC_LIB) "$(DESTDIR)$(LIBDIR)"/${@:install-%=%}
16+	ln -sf $(LIBSWC_LIB) $(DESTDIR)$(LIBDIR)/${@:install-%=%}
17 
18-install-libswc: $($(dir)_TARGETS:$(dir)/%=install-%) | $(DESTDIR)$(INCLUDEDIR)
19-	install -m0644 libswc/swc.h "$(DESTDIR)$(INCLUDEDIR)"
20+install-$(dir): $($(dir)_TARGETS:$(dir)/%=install-%) | $(DESTDIR)$(INCLUDEDIR)
21+	install -m 644 libswc/swc.h $(DESTDIR)$(INCLUDEDIR)
22 
23 CLEAN_FILES += $(SWC_SHARED_OBJECTS) $(SWC_STATIC_OBJECTS)
24
M protocol/local.mk
+2, -2 
 1@@ -17,8 +17,8 @@ $(dir)/%-protocol.c: $(dir)/%.xml
 2 $(dir)/%-server-protocol.h: $(dir)/%.xml
 3 	$(Q_GEN)$(WAYLAND_SCANNER) server-header <$< >$@
 4 
 5-install-protocol: | $(DESTDIR)$(DATADIR)/swc
 6-	install -m0644 protocol/swc.xml "$(DESTDIR)$(DATADIR)/swc"
 7+install-$(dir): | $(DESTDIR)$(DATADIR)/swc
 8+	install -m 644 protocol/swc.xml $(DESTDIR)$(DATADIR)/swc
 9 
10 include common.mk
11