Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 1e70c16 + 4a581cf commit da060b74c4bc5e3851eacb69066071b6c1845e10 @meh meh committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 plugins/Makefile.am
View
4 plugins/Makefile.am
@@ -33,8 +33,8 @@ libsurvival_mapgen_trivial_la_CPPFLAGS = $(AM_CPPFLAGS) -Isurvival/mapgen
libsurvival_mapgen_trivial_la_LIBADD = survival/mapgen/noise/libnoise_simplex.la -lm
libsurvival_mapgen_trivial_la_LDFLAGS = -version-info 0:0:0
-libhttpd_la_SOURCES = http/main.c http/src/HTTPd.c http/include/HTTPd.h
-libhttpd_la_CPPFLAGS = $(AM_CPPFLAGS) -Ihttp
+libhttpd_la_SOURCES = httpd/main.c httpd/src/HTTPd.c httpd/include/HTTPd.h
+libhttpd_la_CPPFLAGS = $(AM_CPPFLAGS) -Ihttpd
libhttpd_la_LDFLAGS = -version-info 0:0:0
# Global build envs

0 comments on commit da060b7

Please sign in to comment.
Something went wrong with that request. Please try again.