DESTDIR support.

[moira.git] / server / Makefile.in

diff --git a/server/Makefile.in b/server/Makefile.in
index d9604466dafe49ed8406c876144378ead896b877..75350372cb63e0d520301fd0811eb6e3cb638ee4 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -14,10 +14,9 @@ PRO_C_INCLUDES=@PRO_C_INCLUDES@
 PRO_C_OPTS=@PRO_C_OPTS@
 PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES)
 LDFLAGS=@LDFLAGS@
-SERVER_LIBS=@GDSS_LIBS@ @SQL_LIBS@
+SQL_LIBS=@SQL_LIBS@
 LIBS=@LIBS@
 MR_LIBDEP=@MR_LIBDEP@
-GDSS_LIBDEP=@GDSS_LIBDEP@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 
@@ -29,12 +28,12 @@ mrbindir=@mrbindir@
 
 SERVER_OBJS=   mr_main.o mr_sauth.o mr_scall.o mr_shutdown.o mr_util.o \
                qvalidate.o qaccess.o qsetup.o qsupport.o qfollow.o \
-               queries2.o qrtn.o qsubs.o increment.o cache.o
+               queries2.o qrtn.o qsubs.o increment.o 
 SCHEMA_OBJS=   ../db/moira_schema.o
 START_OBJS=    startmoira.o
 
 CFILES=                qvalidate.c qaccess.c qsetup.c qsupport.c qfollow.c \
-               qrtn.c increment.c cache.c
+               qrtn.c increment.c
 
 TARGET=moirad startmoira
 
@@ -56,12 +55,12 @@ cleandir distclean: clean
 
 depend: $(CFILES)
 
-install: all
-       $(INSTALL_PROGRAM) moirad $(mrbindir)
-       $(INSTALL_PROGRAM) startmoira $(mrbindir)
+install:
+       $(INSTALL_PROGRAM) moirad $(DESTDIR)$(mrbindir)
+       $(INSTALL_PROGRAM) startmoira $(DESTDIR)$(mrbindir)
 
-moirad: $(SERVER_OBJS) $(SCHEMA_OBJS) $(MR_LIBDEP) $(GDSS_LIBDEP)
-       $(CC) -o $@ $(LDFLAGS) $(SERVER_OBJS) $(SCHEMA_OBJS) $(SERVER_LIBS) $(LIBS)
+moirad: $(SERVER_OBJS) $(SCHEMA_OBJS) $(MR_LIBDEP)
+       $(CC) -o $@ $(LDFLAGS) $(SERVER_OBJS) $(SCHEMA_OBJS) $(SQL_LIBS) $(LIBS)
 
 startmoira: $(START_OBJS)
        $(CC) -o $@ $(LDFLAGS) $(START_OBJS) $(LIBS)