--- a/lib-src/Makefile.in.in	Mon Aug 13 10:32:23 2007 +0200
+++ b/lib-src/Makefile.in.in	Mon Aug 13 10:33:18 2007 +0200
@@ -42,6 +42,10 @@
 LN_S=@LN_S@
 version=@version@
 
+## This will be the name of the generated binary and is set automatically
+## by configure.
+PROGNAME=@PROGNAME@
+
 ## ==================== Where To Install Things ====================
 
 prefix=@prefix@
@@ -61,7 +65,7 @@
 
 ## Things that a user might actually run,
 ## which should be installed in bindir.
-INSTALLABLES = etags ctags b2m gnuclient
+INSTALLABLES = etags ctags b2m gnuclient ootags
 INSTALLABLE_SCRIPTS = rcs-checkin pstogif install-sid send-pr gnudoit gnuattach
 
 ## Things that Emacs runs internally, or during the build process,
@@ -252,13 +256,22 @@
 	$(CC) -c `echo $(cflags) | sed 's/-Demacs/ /'` \
 		-DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
-etags_args = -DOO_BROWSER -I. $(cflags) -I${srcdir} -I${srcdir}/../src \
+etags_args = -I. $(cflags) -I${srcdir} -I${srcdir}/../src \
 	-DVERSION='"${version}"' ${srcdir}/etags.c \
 	$(GETOPTOBJS) regex.o $(ldflags)
 etags_deps   = ${srcdir}/etags.c $(GETOPTDEPS) regex.o ../src/config.h
 
 etags: ${etags_deps}
 	$(CC) ${etags_args} -o $@
+
+ootags_args = -I. $(cflags) -I${srcdir} -I${srcdir}/../src \
+	-DVERSION='"${version}"' ${srcdir}/ootags.c \
+	$(GETOPTOBJS) regex.o $(ldflags)
+ootags_deps   = ${srcdir}/ootags.c $(GETOPTDEPS) regex.o ../src/config.h
+
+ootags: ${ootags_deps}
+	$(CC) ${ootags_args} -o $@
+
 ## ctags depends on etags to assure that parallel makes do not write
 ## two etags.o files on top of each other.
 ctags: ${etags_deps} etags