summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-05-12 19:59:45 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-05-12 19:59:45 +0000
commit85ed672ba9d61eabe1d3ee183bc11b30a71334ae (patch)
treeb9d277f49ca93dcca00f627e9c56a0b80daf1294
parentab157365e39afb399e3a21ae21ce3762c533dfe6 (diff)
2009-05-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile: Now build with libbsdport.
-rw-r--r--http/ChangeLog4
-rw-r--r--http/Makefile8
2 files changed, 7 insertions, 5 deletions
diff --git a/http/ChangeLog b/http/ChangeLog
index 3d4a4be..f869873 100644
--- a/http/ChangeLog
+++ b/http/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-12 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile: Now build with libbsdport.
+
2009-02-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Fix typo.
diff --git a/http/Makefile b/http/Makefile
index 28ce4b9..75377b8 100644
--- a/http/Makefile
+++ b/http/Makefile
@@ -47,22 +47,20 @@ USE_FTPD=yes
ifeq ($(USE_GOAHEAD),yes)
HTTPD = GoAhead Web Server
CFLAGS += -DWEBS -DUEMF -DUSE_GOAHEAD_HTTPD
- LD_LIBS += -lhttpd
+ override LD_LIBS += -lhttpd
endif
ifeq ($(USE_SIMPLE),yes)
HTTPD = Simple HTTPD Web Server
CFLAGS += -DUSE_SIMPLE_HTTPD
- LD_LIBS += -lshttpd
+ override LD_LIBS += -lshttpd
endif
ifeq ($(USE_FTPD),yes)
CFLAGS += -DUSE_FTPD
- LD_LIBS += -lftpd
+ override LD_LIBS += -lftpd
endif
-LD_LIBS +=
-
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want