fixes make install

Fri, 16 Dec 2016 17:16:16 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 16 Dec 2016 17:16:16 +0100
changeset 259
6c8d5f8a1d6f
parent 258
571b62700df6
child 260
26f5f817429e

fixes make install

Makefile file | annotate | diff | comparison | revisions
dav/db.c file | annotate | diff | comparison | revisions
--- a/Makefile	Fri Dec 09 10:55:18 2016 +0100
+++ b/Makefile	Fri Dec 16 17:16:16 2016 +0100
@@ -38,7 +38,6 @@
 
 CONF=gcc
 PREFIX=/usr
-DESTDIR=$(PREFIX)
 
 include $(CONF).mk
 
@@ -75,10 +74,10 @@
 	$(RM) $(RMFLAGS) -R build/
 
 install: FORCE
-	@echo "install to $(DESTDIR)"
-	./install-sh -d $(DESTDIR)/bin
-	./install-sh build/dav $(DESTDIR)/bin
-	./install-sh build/dav-sync $(DESTDIR)/bin
+	@echo "install to $(DESTDIR)$(PREFIX)"
+	./install-sh -d $(DESTDIR)$(PREFIX)/bin
+	./install-sh build/dav $(DESTDIR)$(PREFIX)/bin
+	./install-sh build/dav-sync $(DESTDIR)$(PREFIX)/bin
 
 FORCE:
 
--- a/dav/db.c	Fri Dec 09 10:55:18 2016 +0100
+++ b/dav/db.c	Fri Dec 16 17:16:16 2016 +0100
@@ -282,7 +282,7 @@
             r = xmlTextWriterStartElement(writer, "skipped");
             r += xmlTextWriterEndElement(writer);
             if(r < 0) {
-                fprintf(stderr, "Cannot write skipped: %s\n");
+                fprintf(stderr, "Cannot write skipped\n");
                 xmlFreeTextWriter(writer);
                 return -1;
             }

mercurial