Changeset 3354cea5

Timestamp:

Jan 9, 2007, 3:24:04 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

4096d1f

Parents:

c681337

git-author:

Nelson Elhage <nelhage@mit.edu> (01/09/07 15:24:01)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/09/07 15:24:04)

Message:

Installing the executable/data as barnowl

Files:

• Makefile.in (modified) (5 diffs)
• perlwrap.pm (modified) (2 diffs)

Makefile.in

@@ -5 +5 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = @datadir@
+datadir = @datadir@/barnowl
 bindir = @bindir@
 mandir = @mandir@
@@ -29 +29 @@
 TESTER_SRC = tester.c
 
+EXE = barnowl
+
 BASE_OBJS = $(BASE_SRCS:.c=.o)
 
@@ -42 +44 @@
 
 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
@@ -51 +53 @@
 
 clean: libfaimclean
-        $(RM) owl tester *.o $(AUTOGEN) owl_prototypes.h.new
+        $(RM) $(EXE) tester *.o $(AUTOGEN) owl_prototypes.h.new
 
 distclean: clean libfaimdistclean
@@ -97 +99 @@
         (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}

perlwrap.pm

@@ -17 +17 @@
 };
 
-use lib(get_data_dir()."/owl/lib");
+use lib(get_data_dir()."/lib");
 use lib($::ENV{'HOME'}."/.owl/lib");
 
@@ -397 +397 @@
     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" )
     {