data/Makefile.in          |   10 +++++-----

 simulation/metaserver.cpp |    1 +

 trackedit/Makefile.in     |    4 ++--

 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/Makefile.in b/data/Makefile.in

index 864a7af..47efa7f 100644

--- a/data/Makefile.in

+++ b/data/Makefile.in

@@ -358,11 +358,11 @@ uninstall-am: uninstall-info-am

 install:

-	$(mkinstalldirs) ${usdatadir}

-	cp -r cars environment lang misc music textures textures.dat tiles tracks ${usdatadir}

-	chmod 644 ${usdatadir}/*.*

-	chmod 644 ${usdatadir}/*/*.*

-	chmod 644 ${usdatadir}/*/*/*.*

+	$(mkinstalldirs) $(DESTDIR)${usdatadir}

+	cp -r cars environment lang misc music textures textures.dat tiles tracks $(DESTDIR)${usdatadir}

+	chmod 644 $(DESTDIR)${usdatadir}/*.*

+	chmod 644 $(DESTDIR)${usdatadir}/*/*.*

+	chmod 644 $(DESTDIR)${usdatadir}/*/*/*.*

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

 .NOEXPORT:

diff --git a/simulation/metaserver.cpp b/simulation/metaserver.cpp

index 7f43526..863e2dd 100644

--- a/simulation/metaserver.cpp

+++ b/simulation/metaserver.cpp

@@ -20,6 +20,7 @@

 #include <sys/socket.h>

 #include <netinet/in.h>

 #include <netdb.h>

+#include <unistd.h>

 #ifdef HAVE_CONFIG_H

 #include "config.h"

diff --git a/trackedit/Makefile.in b/trackedit/Makefile.in

index 8d9abc1..60ca7d0 100644

--- a/trackedit/Makefile.in

+++ b/trackedit/Makefile.in

@@ -70,7 +70,7 @@ PROGRAMS = $(bin_PROGRAMS)

 am_ustuntstrackedit_OBJECTS = main.$(OBJEXT)

 ustuntstrackedit_OBJECTS = $(am_ustuntstrackedit_OBJECTS)

 ustuntstrackedit_DEPENDENCIES =  \

-	$(top_builddir)/trackedit/libtrackedit.a \

+	libtrackedit.a \

 	$(top_builddir)/graphics/libgraphics.a \

 	$(top_builddir)/simulation/libsimulation.a \

 	$(top_builddir)/shared/libshared.a

@@ -248,7 +248,7 @@ usdatadir = @usdatadir@

 vorbisfile_CFLAGS = @vorbisfile_CFLAGS@

 vorbisfile_LIBS = @vorbisfile_LIBS@

 ustuntstrackedit_SOURCES = main.cpp

-ustuntstrackedit_LDADD = $(top_builddir)/trackedit/libtrackedit.a \

+ustuntstrackedit_LDADD = libtrackedit.a \

 	$(top_builddir)/graphics/libgraphics.a $(top_builddir)/simulation/libsimulation.a \

 	$(top_builddir)/shared/libshared.a @sdllibs@ @graphlibs@ @LIBINTL@