Permalink
Browse files

first attempt to run properly under cygwin

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@506 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
klacke committed Sep 8, 2003
1 parent 8cd9bf2 commit 28e4c7386f65447e4d48a0bcb027ae5418fb1163
Showing with 3,330 additions and 1,041 deletions.
  1. +14 −6 c_src/Makefile
  2. +3,110 −944 configure
  3. +35 −37 configure.in
  4. +3 −8 include.mk.in
  5. +8 −6 scripts/Install
  6. +3 −3 scripts/Makefile
  7. +4 −3 scripts/mangle
  8. +24 −10 scripts/yaws.ss
  9. +69 −6 src/yaws.erl
  10. +5 −5 src/yaws_compile.erl
  11. +7 −2 src/yaws_config.erl
  12. +13 −2 src/yaws_ctl.erl
  13. +10 −1 src/yaws_log.erl
  14. +24 −7 src/yaws_server.erl
  15. +1 −1 vsn.mk
View
@@ -1,9 +1,17 @@
include ../include.mk
-PRIV_FILES= ../priv/setuid_drv.$(DLL)
+# don't c-compile anything on win32 (yet)
+# I don't know how to make linked in driver using gcc
-CFLAGS += -I${ERLDIR}/usr/include
+ifdef WIN32
+ PRIV_FILES=../priv/.foo
+else
+ PRIV_FILES= ../priv/setuid_drv.$(DLL)
+endif
+
+
+CFLAGS += -I"${ERLDIR}/usr/include"
#
# Targets
@@ -16,16 +24,16 @@ clean:
install:
install -d $(INSTALLPREFIX)/lib/yaws/priv
- install ../priv/setuid_drv.$(DLL) $(INSTALLPREFIX)/lib/yaws/priv
+ install $(PRIV_FILES) $(INSTALLPREFIX)/lib/yaws/priv
../priv/setuid_drv.$(DLL): setuid_drv.$(OBJ)
- $(LD_SHARED) $(OUT)$@ setuid_drv.$(OBJ) $(DLL_LIBS)
-
+ $(LD_SHARED) $(OUT) $@ setuid_drv.$(OBJ) $(DLL_LIBS)
setuid_drv.$(OBJ): setuid_drv.c
$(CC) -c $(FPIC) $(CFLAGS) -DDYNAMIC_DRIVER setuid_drv.c
-
+../priv/.foo:
+ touch ../priv/.foo
Oops, something went wrong.

0 comments on commit 28e4c73

Please sign in to comment.