summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfourdan2006-06-01 15:37:50 +0000
committerfourdan2006-06-01 15:37:50 +0000
commitc86b6983e6536af6d01c88455d9d63bc8999d06c (patch)
treea3cb862e178760ae1d5d9da40c60e4e6c7606d58
parent1edfce0f9016b6c76055d65c1e519c54aca3cbb0 (diff)
downloadivy-cplusplus-c86b6983e6536af6d01c88455d9d63bc8999d06c.zip
ivy-cplusplus-c86b6983e6536af6d01c88455d9d63bc8999d06c.tar.gz
ivy-cplusplus-c86b6983e6536af6d01c88455d9d63bc8999d06c.tar.bz2
ivy-cplusplus-c86b6983e6536af6d01c88455d9d63bc8999d06c.tar.xz
Fix Makefile
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6c283dc..4bcf499 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ else
LD = g++ -shared -fPIC
#PREFIX=/usr/local
ifndef PREFIX
- PREFIX=/usr
- LDFLAGS = -L$(PREFIX)/$(LIB) $(XTLIB)
+ PREFIX=/usr
+ LDFLAGS = -L$(PREFIX)/$(LIB) $(XTLIB)
else
LDFLAGS = -L$(PREFIX)/$(LIB)/ivy $(XTLIB)
endif
@@ -82,7 +82,7 @@ $(LIBIVY_SHARED) : $(OBJECTS)
$(LIBIVY_GLFW_SHARED) : $(OBJECTS_GLFW)
$(LD) -o $(LIBIVY_GLFW_SHARED) $(OBJECTS_GLFW) $(LDFLAGS) $(LIBIVY_GLFW_DEPLIBS)
-install: $(LIBIVY_STATIC) $(LIBIVY_GLFW_STATIC) $(LIBIVY_SHARED) $(LIBIVY_GLFW_SHARED)
+install: default
# headers
mkdir -p $(DESTDIR)$(PREFIX)/include/Ivy
install -m 0644 Ivy*.h $(DESTDIR)$(PREFIX)/include/Ivy
@@ -93,7 +93,7 @@ install: $(LIBIVY_STATIC) $(LIBIVY_GLFW_STATIC) $(LIBIVY_SHARED) $(LIBIVY_GLFW
install -m 0644 $(LIBIVY_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)
install -m 0644 $(LIBIVY_GLFW_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)
-install_mandriva64: $(LIBIVY_STATIC) $(LIBIVY_GLFW_STATIC) $(LIBIVY_SHARED) $(LIBIVY_GLFW_SHARED)
+install_mandriva64: default
# make clean; make install_mandriva64 PREFIX=/usr/local
# make clean; make install_mandriva64 DEBUG=1 PREFIX=/usr/local
#