Skip to content
Snippets Groups Projects
Commit ba065c7e authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/poisson] Make sure that bin and lib exists in ${PREFIX}

Adapt the Makefile patch to create bin and lib in ${PREFIX}. While here,
use ${INSTALL} instead of hardcoding install, and try to be DESTDIR
compliant
parent b61d8062
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@
DISTNAME= PoissonRecon
PKGNAME= poisson-2
PKGREVISION= 1
PKGREVISION= 2
EXTRACT_SUFX= .zip
CATEGORIES= modeling
MASTER_SITES= http://www.cs.jhu.edu/~misha/Code/PoissonRecon/Version2/
......
SHA1 (PoissonRecon.zip) = f902f024ec3733e633a07d9a535407e8127e9f4a
RMD160 (PoissonRecon.zip) = 013d9b849ad1eeb6ae5d277c915075aaf118369d
Size (PoissonRecon.zip) = 110350 bytes
SHA1 (patch-aa) = 572b4d60631d43dd4e3a43158b4b19e5adf90d42
SHA1 (patch-aa) = 109560e4e776072a450d869d507b7c5e8830c954
--- Makefile.orig 2010-08-24 20:28:59.707916210 +0200
+++ Makefile 2010-08-27 10:16:20.169759878 +0200
--- Makefile.orig 2012-02-01 11:26:47.242457899 +0100
+++ Makefile 2012-02-01 11:27:42.062456197 +0100
@@ -4,12 +4,17 @@
# * Revision: $Revision: 233 $
# * Last Updated: $LastChangedDate: 2006-11-10 15:03:28 -0500 (Fri, 10 Nov 2006) $
......@@ -8,7 +8,7 @@
+LTCXX = libtool --tag=CXX --mode=compile ${CXX} ${CFLAGS}
+LINK = libtool --mode=link ${CC} ${CFLAGS} -rpath ${PREFIX}
+LINXX = libtool --tag=CXX --mode=link ${CXX} ${CFLAGS} -rpath ${PREFIX}
+INSTALL= libtool --mode=install install
+LTINSTALL= libtool --mode=install ${INSTALL}
TARGET=PoissonRecon
-SOURCE=CmdLineParser.cpp Factor.cpp Geometry.cpp MarchingCubes.cpp ply.cpp plyfile.cpp Time.cpp MultiGridOctest.cpp
......@@ -21,7 +21,7 @@
CFLAGS_DEBUG = -DDEBUG -g3
LFLAGS_DEBUG =
@@ -19,31 +24,39 @@
@@ -19,31 +24,41 @@
SRC = Src/
BIN = Bin/Linux/
......@@ -45,11 +45,13 @@
+release: $(BIN)$(TARGET) libpoisson.la
+
+install:
+ ${INSTALL} -c libpoisson.la ${PREFIX}/lib/libpoisson.la
+ ${INSTALL} -c $(BIN)$(TARGET) ${PREFIX}/bin/$(TARGET)
+ install -d ${PREFIX}/include/poisson
+ install -m 644 Src/*.h ${PREFIX}/include/poisson
+ install -m 644 Src/*.inl ${PREFIX}/include/poisson
+ ${INSTALL} -d ${DESTDIR}/${PREFIX}/bin
+ ${INSTALL} -d ${DESTDIR}/${PREFIX}/lib
+ ${LT_INSTALL} -c libpoisson.la ${DESTDIR}/${PREFIX}/lib/libpoisson.la
+ ${INSTALL} -c $(BIN)$(TARGET) ${DESTDIR}/${PREFIX}/bin/$(TARGET)
+ ${INSTALL} -d ${DESTDIR}/${PREFIX}/include/poisson
+ ${INSTALL} -m 644 Src/*.h ${DESTDIR}/${PREFIX}/include/poisson
+ ${INSTALL} -m 644 Src/*.inl ${DESTDIR}/${PREFIX}/include/poisson
clean:
rm -f $(BIN)$(TARGET)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment