Skip to content

Commit

Permalink
cmake: Fleshing out the DEPENDS with an adjustment to the BUILD. The …
Browse files Browse the repository at this point in the history
…BUILD

still needs the bootstrap but it now installs man in the correct location.
Also it was a bit pointless to have the BUILD via --system-libs override
anything selected in DEPENDS.
  • Loading branch information
stumbles committed Jun 4, 2013
1 parent 1ecf8b3 commit c1f6616
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
11 changes: 1 addition & 10 deletions devel/cmake/BUILD
@@ -1,13 +1,4 @@
(

# Else it puts it in /usr/usr/share/main1
OPTS+=" --mandir=/share/man"

./bootstrap --prefix=/usr \
--docdir=/share/doc/cmake \
--system-libs \
$OPTS &&
./bootstrap --prefix=/usr $OPTS &&

default_make

) > $C_FIFO 2>&1
11 changes: 7 additions & 4 deletions devel/cmake/DEPENDS
@@ -1,7 +1,10 @@
depends openssl
depends ncurses
depends libidn
depends curl
depends openssl

optional_depends "qt4" "--qt-gui" "" "for qt gui support"
optional_depends "libarchive" "--system-libarchive" "--no-system-libarchive" "use system libarchive"
optional_depends "zlib" "--system-zlib" "--no-system-zlib" "Use system provided zlib"
optional_depends "bzip2" "--system-bzip2" "--no-system-bzip2" "Use system provided bzip2"
optional_depends "curl" "--system-curl" "--no-system-curl" "Use system provided curl"
optional_depends "expat" "--system-expat" "--no-system-expat" "Use system provided expat"
optional_depends "libarchive" "--system-libarchive" "--no-system-libarchive" "use system libarchive"
optional_depends "qt4" "--qt-gui" "--no-qt-gui" "For qt gui support"

0 comments on commit c1f6616

Please sign in to comment.