ed/ed-0.2.diff

79 lines
2.4 KiB
Diff

--- Makefile.in
+++ Makefile.in
@@ -40,9 +40,10 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-infodir = $(prefix)/info
-mandir = $(prefix)/man/man1
+bindir = @bindir@
+infodir = @infodir@
+mandir = @mandir@
+manxdir = $(mandir)/man1
manext = .1
CPPFLAGS = -I. -I$(srcdir) $(DEFS) @CPPFLAGS@
@@ -55,8 +56,8 @@
OBJECTS = buf.o glbl.o io.o main.o re.o signal.o sub.o undo.o version.o
LIBHDRS = pathmax.h getopt.h regex.h
-LIBSRCS = alloca.c error.c getopt.c getopt1.c regex.c xmalloc.c
-LIBOBJS = @ALLOCA@ getopt.o getopt1.o regex.o @LIBOBJS@
+LIBSRCS = alloca.c error.c getopt.c getopt1.c xmalloc.c
+LIBOBJS = @ALLOCA@ getopt.o getopt1.o @LIBOBJS@
DISTFILES = $(HEADERS) $(LIBHDRS) $(LIBSRCS) $(SOURCES) ChangeLog COPYING \
INSTALL Makefile.in NEWS POSIX README TODO THANKS \
@@ -68,11 +69,11 @@
ed: $(OBJECTS) libed.a
$(CC) $(LDFLAGS) -o ed $(OBJECTS) libed.a $(LIBS)
-buf.o: ed.h config.h regex.h
-ed.o: ed.h config.h regex.h
-main.o: ed.h config.h regex.h getopt.h pathmax.h
-re.o: ed.h config.h regex.h
-signal.o: ed.h config.h regex.h
+buf.o: ed.h config.h
+ed.o: ed.h config.h
+main.o: ed.h config.h getopt.h pathmax.h
+re.o: ed.h config.h
+signal.o: ed.h config.h
libed.a: $(LIBOBJS)
rm -f libed.a
@@ -80,7 +81,6 @@
$(RANLIB) libed.a
getopt.o getopt1.o: getopt.h
-regex.o: regex.h
check: ed
rootme=`pwd`; srcrootme=`cd $(srcdir); pwd`;\
@@ -104,20 +104,20 @@
cd $(bindir); \
$(LN_S) $(binprefix)ed $(binprefix)red
$(INSTALL_DATA) $(srcdir)/ed.info $(infodir)/$(binprefix)ed.info
- $(INSTALL_DATA) $(srcdir)/ed.1 $(mandir)/$(binprefix)ed$(manext)
- rm -f $(mandir)/$(binprefix)red$(manext)
- cd $(mandir); \
+ $(INSTALL_DATA) $(srcdir)/ed.1 $(manxdir)/$(binprefix)ed$(manext)
+ rm -f $(manxdir)/$(binprefix)red$(manext)
+ cd $(manxdir); \
$(LN_S) $(binprefix)ed$(manext) $(binprefix)red$(manext)
# Make sure all installation directories, e.g. $(bindir) actually exist by
# making them if necessary.
installdirs:
- $(srcdir)/mkinstalldirs $(bindir) $(infodir) $(mandir)
+ $(srcdir)/mkinstalldirs $(bindir) $(infodir) $(manxdir)
uninstall: all
rm -f $(bindir)/$(binprefix)ed $(bindir)/$(binprefix)red
rm -f $(infodir)/$(binprefix)ed.info
- rm -f $(mandir)/$(binprefix)ed.1 $(mandir)/$(binprefix)red.1
+ rm -f $(manxdir)/$(binprefix)ed.1 $(manxdir)/$(binprefix)red.1
tags: $(HEADERS) $(SOURCES)
ctags $(HEADERS) $(SOURCES)