[365] in BarnOwl Developers
[D-O-H] r507 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:22 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Tue, 9 Jan 2007 15:24:05 -0500 (EST)
Author: nelhage
Date: 2007-01-09 15:24:04 -0500 (Tue, 09 Jan 2007)
New Revision: 507
Modified:
trunk/
trunk/owl/Makefile.in
trunk/owl/perlwrap.pm
Log:
r17896@phanatique: nelhage | 2007-01-09 15:24:01 -0500
Installing the executable/data as barnowl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17894
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17896
Modified: trunk/owl/Makefile.in
===================================================================
--- trunk/owl/Makefile.in 2007-01-09 20:00:36 UTC (rev 506)
+++ trunk/owl/Makefile.in 2007-01-09 20:24:04 UTC (rev 507)
@@ -4,7 +4,7 @@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = @datadir@
+datadir = @datadir@/barnowl
bindir = @bindir@
mandir = @mandir@
@@ -28,6 +28,8 @@
OWL_SRC = owl.c
TESTER_SRC = tester.c
+EXE = barnowl
+
BASE_OBJS = $(BASE_SRCS:.c=.o)
GEN_C = varstubs.c perlglue.c perlwrap.c
@@ -41,7 +43,7 @@
owl: $(AUTOGEN) $(OBJS) owl.o libfaim
- ./athstatic $(CC) -o owl owl.o $(OBJS) $(LDFLAGS) $(LIBS)
+ ./athstatic $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
tester: $(AUTOGEN) $(OBJS) tester.o
./athstatic $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
@@ -50,7 +52,7 @@
./tester reg
clean: libfaimclean
- $(RM) owl tester *.o $(AUTOGEN) owl_prototypes.h.new
+ $(RM) $(EXE) tester *.o $(AUTOGEN) owl_prototypes.h.new
distclean: clean libfaimdistclean
$(RM) config.cache config.log config.status Makefile config.h TAGS *~ core
@@ -96,12 +98,12 @@
libfaimdistclean:
(cd libfaim; $(MAKE) distclean)
-all: owl
+all: $(EXE)
install: all installdirs
- ${INSTALL_PROGRAM} owl ${bindir}/owl
- ${INSTALL_DATA} doc/owl.1 ${mandir}/man1/owl.1
- tar -C perl -c . | tar -C ${datadir}/owl -x
+ ${INSTALL_PROGRAM} $(EXE) ${bindir}/$(EXE)
+ ${INSTALL_DATA} doc/owl.1 ${mandir}/man1/barnowl.1
+ tar -C perl -c . | tar -C ${datadir} -x
installdirs: mkinstalldirs
- ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man1 ${datadir}/owl
+ ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man1 ${datadir}
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2007-01-09 20:00:36 UTC (rev 506)
+++ trunk/owl/perlwrap.pm 2007-01-09 20:24:04 UTC (rev 507)
@@ -16,7 +16,7 @@
bootstrap owl 1.2;
};
-use lib(get_data_dir()."/owl/lib");
+use lib(get_data_dir()."/lib");
use lib($::ENV{'HOME'}."/.owl/lib");
our $configfile;
@@ -396,7 +396,7 @@
sub loadModules () {
my @modules;
my $rv;
- foreach my $dir ( owl::get_data_dir() . "/owl/modules",
+ foreach my $dir ( owl::get_data_dir() . "/modules",
$ENV{HOME} . "/.owl/modules" )
{
opendir( MODULES, $dir );
