From: fluffymormegil <mpread@chiark.greenend.org.uk>
Date: Tue, 12 Oct 2010 21:31:40 +0000 (+0100)
Subject: Made Makefile install rules ACTUALLY work.
X-Git-Tag: v1.0.0~22^2~17
X-Git-Url: http://git.blackswordsonics.com/?a=commitdiff_plain;h=7abe986ea78b049d987de70596052071a5d7b7a8;p=libmormegil

Made Makefile install rules ACTUALLY work.
---

diff --git a/Makefile b/Makefile
index 5a648c3..c620b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ OBJ_BUILDDIR=obj
 LIB_BUILDDIR=lib
 LIB_REALNAME=libmormegil.so.$(MAJOR_VER).$(MINOR_VER).$(COMPAT_DEPTH)
 LIB_SONAME=libmormegil.so.$(MAJOR_VER)
-LIBMORMEGIL=$(LIB_BUILDDIR)/$(LIB_REALNAME)
+LIBMORMEGIL_BUILT=$(LIB_BUILDDIR)/$(LIB_REALNAME)
 LIBOBJS=$(OBJ_BUILDDIR)/dice.o
 LIBS=$(LIB_BUILDDIR)/$(LIB_REALNAME)
 MANPAGES=man/dice.3
@@ -28,7 +28,7 @@ $(OBJ_BUILDDIR)/%.o: src/%.c
 $(OBJ_BUILDDIR)/%.o: src/%.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
-$(LIBMORMEGIL): $(LIBOBJS)
+$(LIBMORMEGIL_BUILT): $(LIBOBJS)
 	gcc $(LINKSTEP_FLAGS) $< -o $@
 
 clean:
@@ -41,13 +41,13 @@ install: install-headers
 ifeq ($(oldincludedir),"")
 install-headers:
 	mkdir -p $(DESTDIR)$(oldincludedir)/libmormegil
-	cp $(INCDIR)/libmormegil/* $(DESTDIR)$(oldincludedir)/libmormegil
+	cp include/libmormegil/* $(DESTDIR)$(oldincludedir)/libmormegil
 	mkdir -p $(DESTDIR)$(includedir)/libmormegil
-	cp $(INCDIR)/libmormegil/* $(DESTDIR)$(includedir)/libmormegil
+	cp include/libmormegil/* $(DESTDIR)$(includedir)/libmormegil
 else
 install-headers:
 	mkdir -p $(DESTDIR)$(includedir)/libmormegil
-	cp $(INCDIR)/libmormegil/* $(DESTDIR)$(includedir)/libmormegil
+	cp include/libmormegil/* $(DESTDIR)$(includedir)/libmormegil
 endif
 
 # vim:noexpandtab:format=cq