Mercurial > repos > libtu-3 / changeset

--- a/Makefile	Wed Dec 20 20:34:02 2000 +0100
+++ b/Makefile	Thu Dec 28 14:40:02 2000 +0100
@@ -22,9 +22,6 @@
 endif
 endif
 
-LIBDIR=$(PREFIX)/lib
-INCDIR=$(PREFIX)/include/libtu
-
 TARGETS=libtu.a
 TESTERS=tester tester2 tester3
 
@@ -51,8 +48,8 @@
 
 _install:
 	$(INSTALLDIR) $(LIBDIR)
-	$(INSTALLDIR) $(INCDIR)
+	$(INSTALLDIR) $(INCDIR)/libtu
 	$(INSTALL) -m $(DATA_MODE) libtu.a $(LIBDIR)
 	for i in include/libtu/*.h; do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(INCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$i $(INCDIR)/libtu; \
 	done

--- a/system.mk	Wed Dec 20 20:34:02 2000 +0100
+++ b/system.mk	Thu Dec 28 14:40:02 2000 +0100
@@ -4,13 +4,19 @@
 
 
 ##
-## Installation directory prefix
+## Installation paths
 ##
 
 PREFIX=/usr/local
 
-#EXTRA_INCLUDES = -I$(PREFIX)/include
-#EXTRA_LIBS = -L$(PREFIX)/lib
+# No need to modify these usually
+BINDIR=$(PREFIX)/bin
+ETCDIR=$(PREFIX)/etc
+MANDIR=$(PREFIX)/man
+DOCDIR=$(PREFIX)/doc
+# Not used
+INCDIR=$(PREFIX)/include
+LIBDIR=$(PREFIX)/lib
 
 
 ##
@@ -26,6 +32,20 @@
 X11_INCLUDES=-I$(X11_PREFIX)/include
 X11_DEFINES=
 
+#EXTRA_INCLUDES = -I$(PREFIX)/include
+#EXTRA_LIBS = -L$(PREFIX)/lib
+
+
+##
+## libc
+##
+
+# You may uncomment this if you know your system has
+# asprintf and vasprintf in the c library. (gnu libc has.)
+# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
+# in sprintf_2.2/ is used.
+#HAS_SYSTEM_ASPRINTF=1
+
 
 ##
 ## C compiler