summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2017-01-07 13:21:25 +0000
committerVincent Sanders <vince@kyllikki.org>2017-01-07 13:21:25 +0000
commit9be0f4ccaf9696173fb910660352be6648811040 (patch)
tree617ba19ec2882976e00e5df58155381c300c6aad
parent2d9ed9cbc4bd611d027b07f40bcf2dad68632857 (diff)
downloadnetsurf-9be0f4ccaf9696173fb910660352be6648811040.tar.gz
netsurf-9be0f4ccaf9696173fb910660352be6648811040.tar.bz2
fixup usage of directory creation macro in Makefiles
-rw-r--r--Makefile2
-rw-r--r--content/handlers/javascript/duktape/Makefile4
-rw-r--r--frontends/amiga/Makefile4
-rw-r--r--frontends/atari/Makefile14
-rw-r--r--frontends/beos/Makefile18
-rw-r--r--frontends/cocoa/Makefile10
-rw-r--r--frontends/framebuffer/Makefile4
-rw-r--r--frontends/gtk/Makefile6
-rw-r--r--frontends/riscos/Makefile2
-rw-r--r--test/Makefile2
10 files changed, 33 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index 77ab0629a..5f2697fdc 100644
--- a/Makefile
+++ b/Makefile
@@ -640,7 +640,7 @@ define split_messages
$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
$$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
- $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1)
$$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$<
$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
diff --git a/content/handlers/javascript/duktape/Makefile b/content/handlers/javascript/duktape/Makefile
index 37e33d59a..fce79def5 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -12,13 +12,13 @@ BINDINGS := $(wildcard content/handlers/javascript/duktape/*.bnd)
GBFLAGS+=-D
$(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
$(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $< $(OBJROOT)/duktape
# create unimplemented report for doxygen
Docs/UnimplementedJavascript.txt: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
- $(Q)mkdir -p $(OBJROOT)/duktape
+ $(Q)$(MKDIR) -p $(OBJROOT)/duktape
$(VQ)echo "/** \page unimplemented Unimplemented javascript bindings" > $@
$(VQ)echo "This is a list of all the binding methods, getters and setters without an implementation in a binding." >> $@
$(VQ)echo "" >> $@
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8115f2f74..aa60207e2 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -76,9 +76,9 @@ AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
- $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)$(MKDIR) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines >$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 60b7f879c..7bc441c33 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -147,13 +147,13 @@ ifneq ($(strip $(STACK)),)
endif
$(Q)rm -rf $(ATARI_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
- $(Q)mkdir $(ATARI_TARGET_DIR)
- $(Q)mkdir $(ATARI_TARGET_DIR)doc
- $(Q)mkdir $(ATARI_TARGET_DIR)downloads
- $(Q)mkdir $(ATARI_TARGET_DIR)res
- $(Q)mkdir $(ATARI_TARGET_DIR)res/fonts
- $(Q)mkdir $(ATARI_TARGET_DIR)res/icons
- $(Q)mkdir $(ATARI_TARGET_DIR)res/cache
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)doc
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)downloads
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/fonts
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/icons
+ $(Q)$(MKDIR) $(ATARI_TARGET_DIR)res/cache
$(Q)touch $(ATARI_TARGET_DIR)cookies
$(Q)touch $(ATARI_TARGET_DIR)url.db
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index f40cce44a..7693ac3f3 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -90,15 +90,15 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
# ----------------------------------------------------------------------------
install-beos:
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ $(Q)cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# ----------------------------------------------------------------------------
# Package target
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index 8935d7b94..a0ebfbb43 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -171,7 +171,7 @@ define make_lproj
R_RESOURCES += $$(OBJROOT)/$(1).lproj
$$(OBJROOT)/$(1).lproj: $(2)
$(VQ)echo Bundling language $(1)
- $(Q)mkdir -p $$@
+ $(Q)$(MKDIR) -p $$@
$(Q)cp -pLR $(2) $$@
$(Q)$(SPLIT_MESSAGES) -l $(1) -p cocoa -f messages resources/FatMessages > $$@/Messages
endef
@@ -182,7 +182,7 @@ $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(1) $$(OBJROOT)/created
$(VQ)echo Compiling XIB $(1) for language $(2)
- $(Q)mkdir -p $$(OBJROOT)/$(2).lproj
+ $(Q)$(MKDIR) -p $$(OBJROOT)/$(2).lproj
$(Q)$(FRONTEND_SOURCE_DIR)/compile-xib.sh $(FRONTEND_RESOURCES_DIR)/$(1) $(2) $$@
ifeq ($(wildcard $(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings),$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings)
@@ -202,16 +202,16 @@ install-cocoa: NetSurf.app
NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES) NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
- $(Q)mkdir -p NetSurf.app/Contents/MacOS
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/MacOS
$(Q)cp NetSurf NetSurf.app/Contents/MacOS
$(Q)rm -rf NetSurf.app/Contents/Resources
- $(Q)mkdir -p NetSurf.app/Contents/Resources
+ $(Q)$(MKDIR) -p NetSurf.app/Contents/Resources
$(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Contents/Resources
$(Q)echo 'APPL????' > NetSurf.app/Contents/PkgInfo
NetSurf.app/Contents/Info.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(FRONTEND_SOURCE_DIR)/Makefile
$(VQ)echo Generating Info.plist
- $(Q)mkdir -p NetSurf.app/Contents
+ $(Q)$(MKDIR) -p NetSurf.app/Contents
$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
-e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
-e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 3d47f8f47..6d2acb079 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -171,8 +171,8 @@ NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css credits.html \
netsurf.png quirks.css welcome.html maps.html Messages
install-framebuffer:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index 76ef9982c..afbfcd791 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -198,11 +198,11 @@ GTK_TRANSLATIONS_HTML := de en fr it ja nl
NSGTK_RESOURCES_DESTDIR := $(DESTDIR)$(word 1,$(subst :, ,$(NETSURF_GTK_RES_PATH)))
install-gtk:
- $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_GTK_BIN)
$(Q)install $(EXETARGET) $(DESTDIR)$(NETSURF_GTK_BIN)netsurf-gtk$(SUBTARGET)
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/icons
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/icons
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(NSGTK_RESOURCES_DESTDIR)/icons
- $(Q)mkdir -p $(NSGTK_RESOURCES_DESTDIR)/throbber
+ $(Q)$(MKDIR) -p $(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png $(NSGTK_RESOURCES_DESTDIR)/throbber
$(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(NSGTK_RESOURCES_DESTDIR) -f -
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(NSGTK_RESOURCES_DESTDIR)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index b457f02da..87790acc0 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -110,7 +110,7 @@ TPL_RISCOS := $(addprefix $(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS))
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
- $$(Q)mkdir -p !NetSurf/Resources/$(1)
+ $$(Q)$$(MKDIR) -p !NetSurf/Resources/$(1)
$$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@
CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT)
diff --git a/test/Makefile b/test/Makefile
index 7a763e943..fd54fb9c2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -166,7 +166,7 @@ coverage: test
$(TESTROOT)/created:
$(VQ)echo " MKDIR: $(TESTROOT)"
- $(Q)$(MKDIR) $(TESTROOT)
+ $(Q)$(MKDIR) -p $(TESTROOT)
$(Q)$(TOUCH) $@
.PHONY: test-clean