summaryrefslogtreecommitdiff
path: root/apps/examples/thttpd
diff options
context:
space:
mode:
Diffstat (limited to 'apps/examples/thttpd')
-rw-r--r--apps/examples/thttpd/Makefile10
-rw-r--r--apps/examples/thttpd/content/Makefile2
2 files changed, 8 insertions, 4 deletions
diff --git a/apps/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile
index 4d39d7d17..f58e1c526 100644
--- a/apps/examples/thttpd/Makefile
+++ b/apps/examples/thttpd/Makefile
@@ -48,7 +48,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
-BIN = $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(WINTOOL),y)
+ BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}"
+else
+ BIN = "$(APPDIR)/libapps$(LIBEXT)"
+endif
ROOTDEPPATH = --dep-path .
@@ -66,7 +70,7 @@ $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@)
headers:
- @$(MAKE) -C content TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV)
+ @$(MAKE) -C content TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
.built: headers $(OBJS)
@( for obj in $(OBJS) ; do \
@@ -84,7 +88,7 @@ depend: .depend
clean:
@rm -f *.o *~ .*.swp .built
- @make -C content clean TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV)
+ @make -C content clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
$(call CLEAN)
distclean: clean
diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile
index 1a3462c23..8c213a9d5 100644
--- a/apps/examples/thttpd/content/Makefile
+++ b/apps/examples/thttpd/content/Makefile
@@ -46,7 +46,7 @@ SYMTAB = $(CONTENT_DIR)/symtab.h
define DIR_template
$(1)_$(2):
- @$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV) CGI_DIR=$(ROMFSCGI_DIR)
+ @$(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) CGI_DIR="$(ROMFSCGI_DIR)"
endef
all: $(ROMFS_HDR) $(SYMTAB)