Changeset 3e9485d for Makefile.in

Timestamp:

Nov 2, 2008, 3:06:37 PM (15 years ago)

Author:

Evan Broder <broder@mit.edu>

Children:

e729e3b

Parents:

f8d0bc0 (diff), 43a306c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into debian

Conflicts:
	.gitignore

File:

• Makefile.in (modified) (2 diffs)

Makefile.in

@@ -11 +11 @@
 CC=@CC@
 LIBS=@LIBS@ -L./libfaim -lfaim
-CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\" -DOWL_SVN_REVNO=$(shell ./svkversion)
+CFLAGS=@CFLAGS@ -I./libfaim -DDATADIR=\"${datadir}\"
 LDFLAGS=@LDFLAGS@
 XSUBPPDIR=@XSUBPPDIR@
@@ -129 +129 @@
 install: all installdirs
         ${INSTALL_PROGRAM} $(EXE) ${DESTDIR}${bindir}/$(EXE)
-        ${INSTALL_DATA} doc/owl.1 ${DESTDIR}${mandir}/man1/barnowl.1
+        ${INSTALL_DATA} doc/barnowl.1 ${DESTDIR}${mandir}/man1/barnowl.1
         ${INSTALL} -d ${DESTDIR}${datadir}/lib
         ${INSTALL} -d ${DESTDIR}${datadir}/modules