Miscellaneous formatting adjustments.

4 files changed, 124 insertions, 95 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index b7f572827..dfb78bde1 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,20 @@
 2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
 
+	Miscellaneous formatting adjustments.
+
+	* lib/Makefile.in (subdirs): Unreferenced macro; delete it.
+	(srcdir, inst_includedir, inst_libdir, distdir): Use braces in macro
+	references; don't respecify $file in destination path when installing.
+	(UUID_OBJS, EXTRA_OBJS, UUID_SOURCES, SOURCES): Adjust indentation.
+	(TEST_OPTIONS): Fold definition; adjust indentation.
+
+	* lib/ddk/Makefile.in lib/directx/Makefile.in:
+	(srcdir, inst_includedir, inst_libdir, distdir): Use braces in macro
+	references; don't respecify $file in destination path when installing.
+	(TEST_OPTIONS): Fold definition; adjust indentation.
+
+2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
+
 	Improve self-documentation of 'for' loop commands.
 
 	* Makefile.in lib/Makefile.in:
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index d1264fefc..d06da0aca 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -9,6 +9,8 @@
 # but WITHOUT ANY WARANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+SUBDIRS = ddk directx
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
@@ -17,9 +19,6 @@ VPATH = @srcdir@
 
 include ${top_builddir}/Makefile.comm
 
-SUBDIRS := ddk directx
-subdirs := ddk directx
-
 # Depending on if we build as part of winsup or mingw we need to
 # add additional include paths in order to get the correct headers
 # from the C library.
@@ -30,50 +29,60 @@ ifeq ($(BUILDENV), cygwin)
 # winsup/include
 # winsup/../newlib/libc/include
 # winsup/../newlib/libc/sys/cygwin
-EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
+EXTRA_INCLUDES = -I${srcdir}/../../include -I${srcdir}/../../../newlib/libc/include -I${srcdir}/../../../newlib/libc/sys/cygwin
 endif
 ifeq ($(BUILDENV), mingw)
-EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
+EXTRA_INCLUDES = -I${srcdir}/../../mingw/include
 endif
 
-INCLUDES = -I$(srcdir)/../include $(EXTRA_INCLUDES)
+INCLUDES = -I${srcdir}/../include $(EXTRA_INCLUDES)
 
 # Headers
 #
-HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h))
-GL_HEADERS = $(notdir $(wildcard $(srcdir)/../include/GL/*.h))
-GDIPLUS_HEADERS = $(notdir $(wildcard $(srcdir)/../include/gdiplus/*.h))
+HEADERS = $(notdir $(wildcard ${srcdir}/../include/*.h))
+GL_HEADERS = $(notdir $(wildcard ${srcdir}/../include/GL/*.h))
+GDIPLUS_HEADERS = $(notdir $(wildcard ${srcdir}/../include/gdiplus/*.h))
 
 # Libraries
 #
-DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
-MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri))
+DEF_FILES = $(notdir $(wildcard ${srcdir}/*.def))
+MRI_FILES = $(notdir $(wildcard ${srcdir}/*.mri))
 IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
 MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES)))
 
 EXTRA_LIBS = libuuid.a libscrnsave.a libscrnsavw.a liblargeint.a
 
 LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS)
-UUID_OBJS = mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \
-			servprov-uuid.o oleidl-uuid.o oleacc-uuid.o ocidl-uuid.o \
-			objsafe-uuid.o oaidl-uuid.o docobj-uuid.o comcat-uuid.o \
-			exdisp-uuid.o mlang-uuid.o objidl-uuid.o cguid-uuid.o \
-			olectlid-uuid.o ativscp-uuid.o urlmon-uuid.o hlink-uuid.o \
-			hlguids-uuid.o extras-uuid.o devguid.o power-uuid.o
-EXTRA_OBJS = shell32.o scrnsave.o scrnsavw.o largeint.o gdiplus.o \
-	$(UUID_OBJS) ws2_32.o
-UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \
-			   servprov-uuid.c oleidl-uuid.c oleacc-uuid.c ocidl-uuid.c \
-			   objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \
-			   exdisp-uuid.c mlang-uuid.c objidl-uuid.c cguid-uuid.c \
-			   olectlid-uuid.c ativscp-uuid.c urlmon-uuid.c hlink-uuid.c \
-			   hlguids-uuid.c extras-uuid.c devguid.c power-uuid.c
-SOURCES = scrnsave.c shell32.c  largeint.c gdiplus.c $(UUID_SOURCES) \
-res.rc test.c ws2_32.c
+
+UUID_OBJS = \
+  mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \
+  servprov-uuid.o oleidl-uuid.o oleacc-uuid.o ocidl-uuid.o \
+  objsafe-uuid.o oaidl-uuid.o docobj-uuid.o comcat-uuid.o \
+  exdisp-uuid.o mlang-uuid.o objidl-uuid.o cguid-uuid.o \
+  olectlid-uuid.o ativscp-uuid.o urlmon-uuid.o hlink-uuid.o \
+  hlguids-uuid.o extras-uuid.o devguid.o power-uuid.o
+
+EXTRA_OBJS = \
+  shell32.o scrnsave.o scrnsavw.o largeint.o gdiplus.o \
+  $(UUID_OBJS) ws2_32.o
+
+UUID_SOURCES = \
+  mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \
+  servprov-uuid.c oleidl-uuid.c oleacc-uuid.c ocidl-uuid.c \
+  objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \
+  exdisp-uuid.c mlang-uuid.c objidl-uuid.c cguid-uuid.c \
+  olectlid-uuid.c ativscp-uuid.c urlmon-uuid.c hlink-uuid.c \
+  hlguids-uuid.c extras-uuid.c devguid.c power-uuid.c
+
+SOURCES = \
+  scrnsave.c shell32.c  largeint.c gdiplus.c $(UUID_SOURCES) \
+  res.rc test.c ws2_32.c
 
 DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
 
 .NOTPARALLEL:
+.PHONY: install install-libraries install-headers install-ddk
+.PHONY: test $(SUBDIRS)
 
 # Targets: (note that 'all-default' is a redirection from 'all',
 # which is the primary default target identified in the included
@@ -92,9 +101,10 @@ ddk:
 directx:
 	$(MAKE) -C $@
 
-TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666  \
-	-Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
-.PHONY: test ddk directx
+TEST_OPTIONS = \
+  $(ALL_CFLAGS) -DWINVER=0x0666 -Wall -pedantic -Wsystem-headers \
+  -c ${srcdir}/test.c -o test.o
+
 test:
 	@echo "Testing w32api..."
 	@for lang in c c++ objective-c ; do \
@@ -129,29 +139,28 @@ libvfw32.a: vfw32.mri libmsvfw32.a libavifil32.a libavicap32.a
 	$(AR) -M < ${word 1,$^}
 	$(RANLIB) $@
 
-.PHONY: install install-libraries install-headers install-ddk
 # Install headers and libraries in a target specified directory.
 #
 install: install-libraries install-headers install-ddk install-directx
 
 install-libraries: all $(need-DESTDIR-compatibility)
-	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+	$(mkinstalldirs) $(DESTDIR)${inst_libdir}
 	for file in $(LIBS); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)${inst_libdir}; \
 	done
 
 install-headers: $(need-DESTDIR-compatibility)
-	$(mkinstalldirs) $(DESTDIR)$(inst_includedir)
+	$(mkinstalldirs) $(DESTDIR)${inst_includedir}
 	for file in $(HEADERS); do \
-	  $(INSTALL_DATA) $(srcdir)/../include/$$file $(DESTDIR)$(inst_includedir)/$$file ; \
+	  $(INSTALL_DATA) ${srcdir}/../include/$$file $(DESTDIR)${inst_includedir}; \
 	done
-	$(mkinstalldirs) $(DESTDIR)$(inst_includedir)/GL
+	$(mkinstalldirs) $(DESTDIR)${inst_includedir}/GL
 	for file in $(GL_HEADERS); do \
-	  $(INSTALL_DATA) $(srcdir)/../include/GL/$$file $(DESTDIR)$(inst_includedir)/GL/$$file ; \
+	  $(INSTALL_DATA) ${srcdir}/../include/GL/$$file $(DESTDIR)${inst_includedir}/GL; \
 	done
-	$(mkinstalldirs) $(DESTDIR)$(inst_includedir)/gdiplus
+	$(mkinstalldirs) $(DESTDIR)${inst_includedir}/gdiplus
 	for file in $(GDIPLUS_HEADERS); do \
-	  $(INSTALL_DATA) $(srcdir)/../include/gdiplus/$$file $(DESTDIR)$(inst_includedir)/gdiplus/$$file ; \
+	  $(INSTALL_DATA) ${srcdir}/../include/gdiplus/$$file $(DESTDIR)${inst_includedir}/gdiplus; \
 	done
 
 install-ddk: install-libraries install-headers
@@ -166,15 +175,15 @@ uninstall: uninstall-ddk uninstall-directx uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
 	for file in $(LIBS); do \
-	  rm -f $(DESTDIR)$(inst_libdir)/$$file ; \
+	  rm -f $(DESTDIR)${inst_libdir}/$$file; \
 	done
-	rmdir $(DESTDIR)$(inst_libdir)
+	rmdir $(DESTDIR)${inst_libdir}
 
 uninstall-headers: $(need-DESTDIR-compatibility)
 	for file in $(HEADERS); do \
-	  rm -r $(DESTDIR)$(inst_includedir)/$$file ; \
+	  rm -r $(DESTDIR)${inst_includedir}/$$file; \
 	done
-	rmdir $(DESTDIR)$(inst_includedir)
+	rmdir $(DESTDIR)${inst_includedir}
 
 uninstall-ddk:
 	cd ddk && $(MAKE) uninstall
@@ -183,26 +192,26 @@ uninstall-directx:
 	cd directx && $(MAKE) uninstall
 
 dist:
-	mkdir $(distdir)/include
-	chmod 755 $(distdir)/include
+	mkdir ${distdir}/include
+	chmod 755 ${distdir}/include
 	for file in $(HEADERS); do \
-	  cp -p $(srcdir)/../include/$$file $(distdir)/include/$$file ; \
+	  cp -p ${srcdir}/../include/$$file ${distdir}/include; \
 	done
-	mkdir $(distdir)/include/GL
+	mkdir ${distdir}/include/GL
 	for file in $(GL_HEADERS); do \
-	  cp -p $(srcdir)/../include/GL/$$file $(distdir)/include/GL/$$file ; \
+	  cp -p ${srcdir}/../include/GL/$$file ${distdir}/include/GL; \
 	done
-	mkdir $(distdir)/include/gdiplus
+	mkdir ${distdir}/include/gdiplus
 	for file in $(GDIPLUS_HEADERS); do \
-	  cp -p $(srcdir)/../include/gdiplus/$$file $(distdir)/include/gdiplus/$$file ; \
+	  cp -p ${srcdir}/../include/gdiplus/$$file ${distdir}/include/gdiplus; \
 	done
-	mkdir $(distdir)/lib
-	chmod 755 $(distdir)/lib
+	mkdir ${distdir}/lib
+	chmod 755 ${distdir}/lib
 	for file in $(DISTFILES); do \
-	  cp -p $(srcdir)/$$file $(distdir)/lib/$$file ; \
+	  cp -p ${srcdir}/$$file ${distdir}/lib; \
 	done
 	for dir in $(SUBDIRS); do \
-	  (cd $$dir; $(MAKE) distdir=../$(distdir) dist); \
+	  (cd $$dir; $(MAKE) distdir=../${distdir} dist); \
 	done
 
 Makefile: Makefile.in ../config.status ../configure
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
index ce6eb39b4..bdfb4f000 100644
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ b/winsup/w32api/lib/ddk/Makefile.in
@@ -27,21 +27,21 @@ ifeq ($(BUILDENV), cygwin)
 # winsup/include
 # winsup/../newlib/libc/include
 # winsup/../newlib/libc/sys/cygwin
-EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
+EXTRA_INCLUDES = -I${srcdir}/../../include -I${srcdir}/../../../newlib/libc/include -I${srcdir}/../../../newlib/libc/sys/cygwin
 endif
 ifeq ($(BUILDENV), mingw)
-EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
+EXTRA_INCLUDES = -I${srcdir}/../../mingw/include
 endif
 
-INCLUDES = -I$(srcdir)/../include $(EXTRA_INCLUDES)
+INCLUDES = -I${srcdir}/../include $(EXTRA_INCLUDES)
 
 # Headers
 #
-HEADERS = $(notdir $(wildcard $(srcdir)/../../include/ddk/*.h))
+HEADERS = $(notdir $(wildcard ${srcdir}/../../include/ddk/*.h))
 
 # Libraries
 #
-DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
+DEF_FILES = $(notdir $(wildcard ${srcdir}/*.def))
 IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
 LIBS = $(IMPLIBS)
 
@@ -55,7 +55,10 @@ DISTFILES = Makefile.in $(DEF_FILES)
 #
 all-default: $(LIBS)
 
-TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
+TEST_OPTIONS = \
+  $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers \
+  -c ${srcdir}/test.c -o test.o
+
 .PHONY: test
 test:
 	@echo "Testing ddk..."
@@ -78,9 +81,9 @@ test:
 install: install-libraries install-headers
 
 install-libraries: all $(need-DESTDIR-compatibility)
-	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+	$(mkinstalldirs) $(DESTDIR)${inst_libdir}
 	for file in $(LIBS); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)${inst_libdir}; \
 	done
 
 ddk_includedir = ${inst_includedir}/ddk
@@ -88,7 +91,7 @@ ddk_includedir = ${inst_includedir}/ddk
 install-headers: $(need-DESTDIR-compatibility)
 	$(mkinstalldirs) $(DESTDIR)${ddk_includedir}
 	for file in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../../include/ddk/$$file $(DESTDIR)${ddk_includedir}; \
+	  $(INSTALL_DATA) ${srcdir}/../../include/ddk/$$file $(DESTDIR)${ddk_includedir}; \
 	done
 
 # Uninstall headers and libraries from a target specified directory
@@ -97,9 +100,9 @@ uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
 	for file in $(LIBS); do \
-	  rm -f $(DESTDIR)$(inst_libdir)/$$file; \
+	  rm -f $(DESTDIR)${inst_libdir}/$$file; \
 	done
-	rmdir $(DESTDIR)$(inst_libdir)
+	rmdir $(DESTDIR)${inst_libdir}
 
 uninstall-headers: $(need-DESTDIR-compatibility)
 	for file in $(HEADERS); do \
@@ -108,15 +111,15 @@ uninstall-headers: $(need-DESTDIR-compatibility)
 	rmdir $(DESTDIR)${ddk_includedir}
 
 dist:
-	mkdir $(distdir)/include/ddk
-	chmod 755 $(distdir)/include/ddk
+	mkdir ${distdir}/include/ddk
+	chmod 755 ${distdir}/include/ddk
 	for file in $(HEADERS); do \
-	  cp -p $(srcdir)/../../include/ddk/$$file $(distdir)/include/ddk/$$file; \
+	  cp -p ${srcdir}/../../include/ddk/$$file ${distdir}/include/ddk; \
 	done
-	mkdir $(distdir)/lib/ddk
-	chmod 755 $(distdir)/lib/ddk
+	mkdir ${distdir}/lib/ddk
+	chmod 755 ${distdir}/lib/ddk
 	for file in $(DISTFILES); do \
-	  cp -p $(srcdir)/$$file $(distdir)/lib/ddk/$$file; \
+	  cp -p ${srcdir}/$$file ${distdir}/lib/ddk; \
 	done
 
 Makefile: Makefile.in ../../config.status ../../configure
diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in
index 24165237e..f66e486b0 100644
--- a/winsup/w32api/lib/directx/Makefile.in
+++ b/winsup/w32api/lib/directx/Makefile.in
@@ -27,23 +27,23 @@ ifeq ($(BUILDENV), cygwin)
 # winsup/include
 # winsup/../newlib/libc/include
 # winsup/../newlib/libc/sys/cygwin
-EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
+EXTRA_INCLUDES = -I${srcdir}/../../include -I${srcdir}/../../../newlib/libc/include -I${srcdir}/../../../newlib/libc/sys/cygwin
 endif
 ifeq ($(BUILDENV), mingw)
-EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
+EXTRA_INCLUDES = -I${srcdir}/../../mingw/include
 endif
 
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../include/directx $(EXTRA_INCLUDES)
+INCLUDES = -I${srcdir}/../include -I${srcdir}/../include/directx $(EXTRA_INCLUDES)
 
 # Headers
 #
-HEADERS = $(notdir $(wildcard $(srcdir)/../../include/directx/*.h))
+HEADERS = $(notdir $(wildcard ${srcdir}/../../include/directx/*.h))
 
 # Libraries
 #
-DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
-DIST_C_FILES = $(notdir $(wildcard $(srcdir)/*.c))
-DIST_H_FILES = $(notdir $(wildcard $(srcdir)/*.h))
+DEF_FILES = $(notdir $(wildcard ${srcdir}/*.def))
+DIST_C_FILES = $(notdir $(wildcard ${srcdir}/*.c))
+DIST_H_FILES = $(notdir $(wildcard ${srcdir}/*.h))
 LIBS = libd3d8.a libd3d9.a libd3dim.a libd3drm.a libd3dx8d.a libd3dx9d.a \
        libd3dxof.a libddraw.a libdinput.a libdinput8.a libdmoguids.a \
        libdplayx.a libdpnaddr.a libdpnet.a libdpnlobby.a libdpvoice.a \
@@ -62,7 +62,9 @@ DISTFILES = Makefile.in $(DEF_FILES) $(DIST_C_FILES) $(DIST_H_FILES)
 #
 all-default: $(LIBS)
 
-TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
+TEST_OPTIONS = \
+  $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers \
+  -c $(srcdir)/test.c -o test.o
 .PHONY: test
 test:
 	@echo "Testing directx..."
@@ -89,12 +91,12 @@ libdxerr9.a: dxerr9.o dxerr9w.o
 	$(RANLIB) $@
 
 libdinput.a: dinput.def $(DINPUT_OBJS)
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/dinput.def
+	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def ${srcdir}/dinput.def
 	$(AR) r $@ $(DINPUT_OBJS)
 	$(RANLIB) $@
 
 libdinput8.a: dinput8.def $(DINPUT_OBJS)
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/dinput8.def
+	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def ${srcdir}/dinput8.def
 	$(AR) r $@ $(DINPUT_OBJS)
 	$(RANLIB) $@
 
@@ -103,15 +105,15 @@ libdinput8.a: dinput8.def $(DINPUT_OBJS)
 install: install-libraries install-headers
 
 install-libraries: all $(need-DESTDIR-compatibility)
-	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+	$(mkinstalldirs) $(DESTDIR)${inst_libdir}
 	for file in $(LIBS); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)${inst_libdir}; \
 	done
 
 install-headers: $(need-DESTDIR-compatibility)
-	$(mkinstalldirs) $(DESTDIR)$(inst_includedir)
+	$(mkinstalldirs) $(DESTDIR)${inst_includedir}
 	for file in $(HEADERS); do \
-	  $(INSTALL_DATA) $(srcdir)/../../include/directx/$$file $(DESTDIR)$(inst_includedir)/$$file; \
+	  $(INSTALL_DATA) ${srcdir}/../../include/directx/$$file $(DESTDIR)${inst_includedir}; \
 	done
 
 # Uninstall headers and libraries from a target specified directory
@@ -120,26 +122,26 @@ uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
 	for file in $(LIBS); do \
-	  rm -f $(DESTDIR)$(inst_libdir)/$$file; \
+	  rm -f $(DESTDIR)${inst_libdir}/$$file; \
 	done
-	rmdir $(DESTDIR)$(inst_libdir)
+	rmdir $(DESTDIR)${inst_libdir}
 
 uninstall-headers: $(need-DESTDIR-compatibility)
 	for file in $(HEADERS); do \
-	  rm -r $(DESTDIR)$(inst_includedir)/$$file; \
+	  rm -r $(DESTDIR)${inst_includedir}/$$file; \
 	done
-	rmdir $(DESTDIR)$(inst_includedir)
+	rmdir $(DESTDIR)${inst_includedir}
 
 dist:
-	mkdir $(distdir)/include/directx
-	chmod 755 $(distdir)/include/directx
+	mkdir ${distdir}/include/directx
+	chmod 755 ${distdir}/include/directx
 	for file in $(HEADERS); do \
-	  cp -p $(srcdir)/../../include/directx/$$file $(distdir)/include/directx/$$file; \
+	  cp -p ${srcdir}/../../include/directx/$$file ${distdir}/include/directx; \
 	done
-	mkdir $(distdir)/lib/directx
-	chmod 755 $(distdir)/lib/directx
+	mkdir ${distdir}/lib/directx
+	chmod 755 ${distdir}/lib/directx
 	for file in $(DISTFILES); do \
-	  cp -p $(srcdir)/$$file $(distdir)/lib/directx/$$file; \
+	  cp -p ${srcdir}/$$file ${distdir}/lib/directx; \
 	done
 
 Makefile: Makefile.in ../../config.status ../../configure