Skip to content

Commit

Permalink
- removed init script installation from spacenavd's install target, a…
Browse files Browse the repository at this point in the history
…dded

  message to the user instead.

Applied Hans Meine's patches:
- allow build dir != source dir
- install into /lib64 if /lib64 exists
  (modified that one to use uname -m in the configure script, debian seems to
  have a lib64 even on 32bit systems)
- display X11 connection closing in verbose mode, too (not only init)



git-svn-id: svn+ssh://svn.code.sf.net/p/spacenav/code/trunk/spnavcfg@47 ef983eb1-d774-4af8-acfd-baaf7b16a646
  • Loading branch information
jtsiomb committed Aug 14, 2008
1 parent f62cd24 commit c883191
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ LDFLAGS = `pkg-config --libs gtk+-2.0`
$(bin): $(obj)
$(CC) -o $@ $(obj) $(LDFLAGS)

%.o: $(srcdir)/%.c
$(CC) $(CFLAGS) -c $< -o $@

.PHONY: clean
clean:
rm -f $(obj) $(bin)
Expand Down
9 changes: 6 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ OPT=yes
DBG=yes
X11=yes

srcdir="`dirname "$0"`"

for arg; do
case "$arg" in
--prefix=*)
Expand Down Expand Up @@ -43,9 +45,10 @@ echo " optimize for speed: $OPT"
echo " include debugging symbols: $DBG"
echo

# create makefile
echo 'creating makefile ...'
# create Makefile
echo 'creating Makefile ...'
echo "PREFIX = $PREFIX" >Makefile
echo "srcdir = $srcdir" >>Makefile

if [ "$DBG" = 'yes' ]; then
echo 'dbg = -g' >>Makefile
Expand All @@ -55,7 +58,7 @@ if [ "$OPT" = 'yes' ]; then
echo 'opt = -O3' >>Makefile
fi

cat Makefile.in >>Makefile
cat "$srcdir/Makefile.in" >>Makefile

echo ''
echo 'Done. You can now type make (or gmake) to compile spnavcfg.'
Expand Down

0 comments on commit c883191

Please sign in to comment.