X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=70a93d2fd4b86a6f3369257e287ca3191265b0eb;hb=608859d57ed847296e950d795f3fa7e569f19a60;hp=87061dd8b60691dfd2b5107a76ecdf707d8755d4;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/src/Makefile.am b/src/Makefile.am
index 87061dd8b6..70a93d2fd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,10 @@
 
 # PSPP
 
+# If you change this, you must also change the corresponding line in 
+# config/Makefile.am
+pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+
 bin_PROGRAMS = pspp
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/lib	\
@@ -43,20 +47,16 @@ sysfile-info.c tab.c tab.h temporary.c title.c t-test.c val-labs.c	\
 var-labs.c var.h vars-atr.c vars-prs.c vector.c vector.h version.c	\
 version.h vfm.c vfm.h vfmP.h weight.c
 
-GMP_LIBS = ../lib/gmp/mpf/libmpf.a			\
-	../lib/gmp/mpn/libmpn.a			\
-	../lib/gmp/libgmp.a
-
 LDADD =	../lib/julcal/libjulcal.a		\
 	../lib/misc/libmisc.a			\
 	../lib/dcdflib/libdcdflib.a		\
-	@GMP_LIBS@ @INTLLIBS@
+	@LIBINTL@
 
 version.c:
 	echo "#include <config.h>" > version.c
 	echo "const char bare_version[] = \"@VERSION@\";" >> version.c
-	echo "const char version[] = GNU_PACKAGE \" @VERSION@\";" >> version.c
-	echo "const char stat_version[] = GNU_PACKAGE \" @VERSION@ \
+	echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> version.c
+	echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \
 (`date`).\";" >> version.c
 	echo "const char host_system[] = \"$(host_triplet)\";" >> version.c
 	echo "const char build_system[] = \"$(build_triplet)\";" >> version.c
@@ -72,16 +72,6 @@ version.c:
 	echo "	\"/usr/share/groff/font\";" >> version.c
 	echo "const char locale_dir[] = \"$(datadir)/locale\";" >> version.c
 
-# q2c
-
-LOCAL_CC = @LOCAL_CC@
-LOCAL_COMPILE = $(LOCAL_CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LOCAL_LINK = $(LOCAL_CC) $(LDFLAGS) -o $@
 
-q2c.o: q2c.c
-	$(LOCAL_COMPILE) $< -o q2c.o
-q2c: q2c.o
-	$(LOCAL_LINK) q2c.o ../lib/misc/libmisc.a -o q2c
-
-CLEANFILES = q2c
-MAINTAINERCLEANFILES = Makefile.in
+noinst_PROGRAMS = q2c
+q2c_SOURCES = q2c.c