Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -42,8 +42,8 @@ TOOLSET_PREFIX=x86_64-w64-mingw32-
 else
 TOOLSET_PREFIX=i686-w64-mingw32-
 endif
-CXX=g++
-CC=gcc
+CXX?=g++
+CC?=gcc
 endif
 
 CXX_TEMP:=$(CXX)
@@ -51,7 +51,7 @@ CC_TEMP:=$(CC)
 override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
 override CC=$(TOOLSET_PREFIX)$(CC_TEMP)
 
-INCLUDES= -DVERSION_BUILD=$(PLATFORM_BUILD) -DVERSION_BRANCH=\"$(PLATFORM_BRANCH)\" -DVERSION_REVISION=\"$(PLATFORM_REVISION)\" -I. -Ishared -Iengine -Igame -Ienet/include -Isupport
+INCLUDES= -DVERSION_BUILD=$(PLATFORM_BUILD) -DVERSION_BRANCH=\"$(PLATFORM_BRANCH)\" -DVERSION_REVISION=\"$(PLATFORM_REVISION)\" -I. -Ishared -Iengine -Igame `pkg-config --cflags libenet` -Isupport
 ifneq (,$(WANT_STEAM))
 override INCLUDES+= -DUSE_STEAM=1 -Isteam
 endif
@@ -109,7 +109,7 @@ ifneq (,$(findstring linux,$(PLATFORM)))
 BIN_SUFFIX=_linux
 else
 ifneq (,$(findstring bsd,$(PLATFORM)))
-BIN_SUFFIX=_bsd
+BIN_SUFFIX=
 ifneq (,$(findstring openbsd,$(PLATFORM)))
 RMFLAGS= -f
 endif
@@ -118,7 +118,7 @@ BIN_SUFFIX=_native
 endif
 endif
 CLIENT_INCLUDES= $(INCLUDES) `$(PKG_CONFIG) --cflags x11 sdl2 SDL2_image SDL2_mixer zlib gl`
-CLIENT_LIBS= -Lenet -lenet `$(PKG_CONFIG) --libs x11 sdl2 SDL2_image SDL2_mixer zlib gl`
+CLIENT_LIBS= `pkg-config --libs libenet` `$(PKG_CONFIG) --libs x11 sdl2 SDL2_image SDL2_mixer zlib gl`
 ifneq (,$(WANT_STEAM))
 override CLIENT_LIBS+= -L../bin/$(PLATFORM_BIN) -lsteam_api
 endif
@@ -216,7 +216,7 @@ endif
 endif
 else
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) `pkg-config --cflags zlib`
-SERVER_LIBS= -Lenet -lenet `pkg-config --libs zlib`
+SERVER_LIBS= `pkg-config --libs libenet` `pkg-config --libs zlib`
 CTFONT_INCLUDES= -DSTANDALONE `pkg-config --cflags zlib freetype2`
 CTFONT_LIBS= `pkg-config --libs zlib freetype2`
 ifneq (,$(WANT_STEAM))
@@ -239,8 +239,6 @@ SERVER_OBJS= \
 	engine/server-standalone.o \
 	game/server-standalone.o
 
-LIBENET= enet/libenet.a
-
 GENKEY_OBJS= shared/genkey.o shared/crypto-standalone.o
 CTFONT_OBJS= shared/cube2font.o
 
@@ -248,9 +246,6 @@ all:
 
 default: all
 
-clean-enet:
-	$(MAKE) -C enet clean
-
 clean-client:
 	@rm $(RMFLAGS) $(CLIENT_PCH) $(CLIENT_OBJS) $(APPCLIENT)$(BIN_SUFFIX)
 
@@ -263,7 +258,7 @@ clean-genkey:
 clean-cube2font:
 	@rm $(RMFLAGS) $(CTFONT_OBJS) cube2font$(BIN_SUFFIX)
 
-clean: clean-enet clean-client clean-server clean-genkey clean-cube2font
+clean: clean-client clean-server clean-genkey clean-cube2font
 
 %.h.gch: %.h
 	$(CXX) $(CXXFLAGS) -x c++-header -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
@@ -293,10 +288,10 @@ $(APPSERVER)_windows$(BIN_SUFFIX): $(SERVER_OBJS)
 	$(WINDRES) -i $(APPNAME).rc -J rc -o $(APPNAME).res -O coff
 	$(CXX) $(CXXFLAGS) -o $@ $(APPNAME).res $(SERVER_OBJS) $(SERVER_LIBS)
 
-$(APPCLIENT)$(BIN_SUFFIX): $(LIBENET) $(CLIENT_OBJS)
+$(APPCLIENT)$(BIN_SUFFIX): $(CLIENT_OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(CLIENT_OBJS) $(CLIENT_LIBS)
 
-$(APPSERVER)$(BIN_SUFFIX): $(LIBENET) $(SERVER_OBJS)
+$(APPSERVER)$(BIN_SUFFIX): $(SERVER_OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS)
 
 client: $(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX)
@@ -350,9 +345,6 @@ install-cube2font: $(INSTDIR)/cube2font$(BIN_SUFFIX)
 
 install: install-client install-server install-genkey install-cube2font
 
-$(LIBENET):
-	$(MAKE) -C enet
-
 depend:
 	makedepend -Y -I. -Ishared -Iengine -Igame -Isupport $(subst .o,.cpp,$(CLIENT_OBJS))
 	makedepend -a -o-standalone.o -Y -I. -Ishared -Iengine -Igame -Isupport -DSTANDALONE $(subst -standalone.o,.cpp,$(SERVER_OBJS))
@@ -361,7 +353,7 @@ depend:
 all: client server genkey cube2font
 
 include system-install.mk
-include dist.mk
+#include dist.mk
 include wiki.mk
 
 engine/engine.h.gch: engine/version.h shared/cube.h.gch
