Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
tecla: update to 1.6.3; fix patches.
- Loading branch information
Showing
3 changed files
with
21 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,120 +1,17 @@ | ||
--- Makefile.in.orig 2014-01-23 12:52:25.000000000 -0500 | ||
+++ Makefile.in 2014-01-23 13:01:13.000000000 -0500 | ||
@@ -165,10 +165,10 @@ | ||
default: $(TARGETS) | ||
--- Makefile.in.orig | ||
+++ Makefile.in | ||
@@ -15,10 +15,10 @@ srcdir = @srcdir@ | ||
|
||
prefix=@prefix@ | ||
exec_prefix=@exec_prefix@ | ||
-LIBDIR=@libdir@ | ||
-INCDIR=@includedir@ | ||
-MANDIR=@mandir@ | ||
-BINDIR=@bindir@ | ||
+LIBDIR=$(DESTDIR)@libdir@ | ||
+INCDIR=$(DESTDIR)@includedir@ | ||
+MANDIR=$(DESTDIR)@mandir@ | ||
+BINDIR=$(DESTDIR)@bindir@ | ||
|
||
# Which C compiler do you want to use? | ||
|
||
normal: | ||
- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) | ||
+ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' | ||
|
||
reentrant: | ||
- @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS) | ||
+ @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)' | ||
|
||
demos: normal | ||
|
||
@@ -187,41 +187,41 @@ | ||
autom*.cache | ||
cp $(srcdir)/Makefile.stub Makefile | ||
|
||
-install_lib: $(TARGETS) $(LIBDIR) | ||
+install_lib: $(TARGETS) $(DESTDIR)$(LIBDIR) | ||
@for lib in libtecla.a libtecla_r.a ; do \ | ||
if [ -f $$lib ] ; then \ | ||
- cp $$lib $(LIBDIR)/ ; chmod ugo+r $(LIBDIR)/$$lib; \ | ||
- echo "cp $$lib $(LIBDIR)/ ; chmod ugo+r $(LIBDIR)/$$lib"; \ | ||
+ cp $$lib $(DESTDIR)$(LIBDIR)/ ; chmod ugo+r $(DESTDIR)$(LIBDIR)/$$lib; \ | ||
+ echo "cp $$lib $(DESTDIR)$(LIBDIR)/ ; chmod ugo+r $(DESTDIR)$(LIBDIR)/$$lib"; \ | ||
fi ; \ | ||
done | ||
@for lib in libtecla libtecla_r ; do \ | ||
src="$$lib@SHARED_EXT@"; \ | ||
if [ -f $$src ] ; then \ | ||
- dst="$(LIBDIR)/$$src"; \ | ||
+ dst="$(DESTDIR)$(LIBDIR)/$$src"; \ | ||
cp -f $$src $$dst; chmod a=rX $$dst; \ | ||
echo "cp -f $$src $$dst ; chmod a=rX $$dst"; \ | ||
endings="@SHARED_ALT@" ; \ | ||
for alt in $$endings ; do \ | ||
lnk="$$lib$$alt"; \ | ||
- (cd $(LIBDIR); rm -f $$lnk; @LN_S@ $$src $$lnk); \ | ||
- echo "(cd $(LIBDIR); rm -f $$lnk; @LN_S@ $$src $$lnk)"; \ | ||
+ (cd $(DESTDIR)$(LIBDIR); rm -f $$lnk; @LN_S@ $$src $$lnk); \ | ||
+ echo "(cd $(DESTDIR)$(LIBDIR); rm -f $$lnk; @LN_S@ $$src $$lnk)"; \ | ||
done ; \ | ||
fi ; \ | ||
done | ||
|
||
-install_inc: $(INCDIR) | ||
+install_inc: $(DESTDIR)$(INCDIR) | ||
@if [ -f $(srcdir)/libtecla.h ]; then \ | ||
- cp $(srcdir)/libtecla.h $(INCDIR)/ ; chmod ugo+r $(INCDIR)/libtecla.h; \ | ||
- echo "cp $(srcdir)/libtecla.h $(INCDIR)/ ; chmod ugo+r $(INCDIR)/libtecla.h"; \ | ||
+ cp $(srcdir)/libtecla.h $(DESTDIR)$(INCDIR)/ ; chmod ugo+r $(DESTDIR)$(INCDIR)/libtecla.h; \ | ||
+ echo "cp $(srcdir)/libtecla.h $(DESTDIR)$(INCDIR)/ ; chmod ugo+r $(DESTDIR)$(INCDIR)/libtecla.h"; \ | ||
fi | ||
|
||
-install_man: $(MANDIR) libr_man func_man prog_man misc_man file_man | ||
+install_man: $(DESTDIR)$(MANDIR) libr_man func_man prog_man misc_man file_man | ||
|
||
libr_man: | ||
if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ | ||
for template in man/libr/*.in; do \ | ||
page=`basename "$$template" .in`; \ | ||
- $(srcdir)/install-sh -c -m 644 man/libr/$$page ${MANDIR}/@LIBR_MANDIR@/$$page.@LIBR_MANEXT@; \ | ||
+ $(srcdir)/install-sh -c -m 644 man/libr/$$page $(DESTDIR)$(MANDIR)/@LIBR_MANDIR@/$$page.@LIBR_MANEXT@; \ | ||
done ; \ | ||
fi | ||
|
||
@@ -229,7 +229,7 @@ | ||
if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ | ||
for template in man/func/*.in; do \ | ||
page=`basename "$$template" .in`; \ | ||
- $(srcdir)/install-sh -c -m 644 man/func/$$page ${MANDIR}/@FUNC_MANDIR@/$$page.@FUNC_MANEXT@; \ | ||
+ $(srcdir)/install-sh -c -m 644 man/func/$$page $(DESTDIR)$(MANDIR)/@FUNC_MANDIR@/$$page.@FUNC_MANEXT@; \ | ||
done ; \ | ||
fi | ||
|
||
@@ -237,7 +237,7 @@ | ||
if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ | ||
for template in man/prog/*.in; do \ | ||
page=`basename "$$template" .in`; \ | ||
- $(srcdir)/install-sh -c -m 644 man/prog/$$page ${MANDIR}/@PROG_MANDIR@/$$page.@PROG_MANEXT@; \ | ||
+ $(srcdir)/install-sh -c -m 644 man/prog/$$page $(DESTDIR)$(MANDIR)/@PROG_MANDIR@/$$page.@PROG_MANEXT@; \ | ||
done ; \ | ||
fi | ||
|
||
@@ -245,7 +245,7 @@ | ||
if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ | ||
for template in man/misc/*.in; do \ | ||
page=`basename "$$template" .in`; \ | ||
- $(srcdir)/install-sh -c -m 644 man/misc/$$page ${MANDIR}/@MISC_MANDIR@/$$page.@MISC_MANEXT@; \ | ||
+ $(srcdir)/install-sh -c -m 644 man/misc/$$page $(DESTDIR)$(MANDIR)/@MISC_MANDIR@/$$page.@MISC_MANEXT@; \ | ||
done ; \ | ||
fi | ||
|
||
@@ -253,20 +253,20 @@ | ||
if test "@MAKE_MAN_PAGES@"_ = "yes"_; then \ | ||
for template in man/file/*.in; do \ | ||
page=`basename "$$template" .in`; \ | ||
- $(srcdir)/install-sh -c -m 644 man/file/$$page ${MANDIR}/@FILE_MANDIR@/$$page.@FILE_MANEXT@; \ | ||
+ $(srcdir)/install-sh -c -m 644 man/file/$$page $(DESTDIR)$(MANDIR)/@FILE_MANDIR@/$$page.@FILE_MANEXT@; \ | ||
done ; \ | ||
fi | ||
|
||
-install_bin: $(BINDIR) $(PROGRAMS) $(PROGRAMS_R) | ||
+install_bin: $(DESTDIR)$(BINDIR) $(PROGRAMS) $(PROGRAMS_R) | ||
progs="$(PROGRAMS) $(PROGRAMS_R)"; \ | ||
for prog in $$progs; do \ | ||
- $(srcdir)/install-sh -c -m 755 -s $$prog $(BINDIR)/; \ | ||
+ $(srcdir)/install-sh -c -m 755 -s $$prog $(DESTDIR)$(BINDIR)/; \ | ||
done | ||
|
||
install: install_lib install_inc install_man install_bin | ||
|
||
# Make any missing installation directories. | ||
|
||
-$(MANDIR) $(LIBDIR) $(INCDIR) $(BINDIR): | ||
+$(DESTDIR)$(MANDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR): | ||
$(srcdir)/install-sh -d $@ | ||
chmod ugo+rx $@ |
This file was deleted.
Oops, something went wrong.