fixed up directory creation

diff --git a/Makefile b/Makefile
index cad83c9..db26a37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,23 +85,27 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
 
 # how to make a directory
 ${BLDDIRS}:
+       ${Q1}${PRNTFMT} "mkdir" "$@"
        ${Q2}mkdir -p $@
 
+# cause the below directory rules to work out
+.SECONDEXPANSION:
+
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
+${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
        ${Q1}${PRNTFMT} "${CXX}" "$@"
        ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 # rule to make a depend file from a .cpp
 #   be clever and escape the / chars in file paths
 #   DON'T simply use another sed delimiter or it can't appear in the file paths
-${DEPSDIR}%.d: ${SRCSDIR}%.cpp | ${DEPSBLDDIRS}
+${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
        ${Q1}${PRNTFMT} "DEP" "$@"
        ${Q2}${CXX} -MM ${CXXFLAGS} $< | \
                sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
 # rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR}
+${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
        ${Q1}${PRNTFMT} "cp" "$@"
        ${Q2}cp $< $@
 

diff --git a/src/dir.mk b/src/dir.mk
index 886c693..5f46c30 100644 (file)
--- a/src/dir.mk
+++ b/src/dir.mk
@@ -18,7 +18,7 @@ NEWSRCS += debug.cpp
 
 # Post dir setup
 
-CURDIR  :=
+CURDIR  := ./
 
 NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS})
 NEWOBJS := ${NEWSRCS:.cpp=.o}