rpms/aplus-fsf/devel aplus-fsf-4.22.4-makefile.patch, NONE, 1.1 aplus-fsf.spec, 1.27, 1.28 aplus-fsf-4.22.3-makefile.patch, 1.1, NONE
Jochen Schmitt
s4504kr at fedoraproject.org
Mon Nov 17 19:54:09 UTC 2008
- Previous message: rpms/fwknop/devel fwknop-1.9.9-hostname.patch, NONE, 1.1 fwknop.spec, 1.4, 1.5 fwknop-1.9.6-hostname.patch, 1.1, NONE
- Next message: rpms/ktorrent/devel .cvsignore, 1.24, 1.25 ktorrent.spec, 1.80, 1.81 sources, 1.24, 1.25 ktorrent-3.1.4-kdeinit.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: s4504kr
Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4716
Modified Files:
aplus-fsf.spec
Added Files:
aplus-fsf-4.22.4-makefile.patch
Removed Files:
aplus-fsf-4.22.3-makefile.patch
Log Message:
Try to fix issue with libtools-2
aplus-fsf-4.22.4-makefile.patch:
--- NEW FILE aplus-fsf-4.22.4-makefile.patch ---
diff -up aplus-fsf-4.22/configure.in.org aplus-fsf-4.22/configure.in
--- aplus-fsf-4.22/configure.in.org 2008-04-08 21:24:30.000000000 +0200
+++ aplus-fsf-4.22/configure.in 2008-11-17 20:28:05.000000000 +0100
@@ -14,9 +14,13 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+APLVERSION=4.20.2
+
+AC_SUBST(APLVERSION)
+
AC_PROG_INSTALL
dnl Checks for libraries.
@@ -43,11 +47,20 @@ dnl AC_CHECK_LIB(nsl, socket, LIB
dnl ], "$LIBS")
dnl ])
+
+dnl Check X11-Prefix
+if test -d /usr/X11R6; then
+ X_PREFIX=/usr/X11R6
+else
+ X_PREFIX=/usr
+fi
+AC_SUBST(X_PREFIX)
+
dnl Checks for X headers and libs.
AC_PATH_X([X11], [X11/Xlib.h], [XOpenDisplay(NULL)])
if test "x$no_x" = "x"; then
X_INCLUDES="-I$x_includes"
- X_LIBS="-L$x_libraries -lX11"
+ X_LIBS="-lX11"
else
X_INCLUDES=""
X_LIBS=""
diff -up aplus-fsf-4.22/src/acore/Makefile.am.org aplus-fsf-4.22/src/acore/Makefile.am
--- aplus-fsf-4.22/src/acore/Makefile.am.org 2008-04-08 21:29:45.000000000 +0200
+++ aplus-fsf-4.22/src/acore/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-acoredir = $(prefix)/acore
+acoredir = $(prefix)/lib/a+
acore_DATA = \
adap.+ \
diff -up aplus-fsf-4.22/src/a/Makefile.am.org aplus-fsf-4.22/src/a/Makefile.am
--- aplus-fsf-4.22/src/a/Makefile.am.org 2008-04-08 21:27:15.000000000 +0200
+++ aplus-fsf-4.22/src/a/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -50,7 +50,7 @@ liba_la_SOURCES = \
x.h
-CFLAGS = @CFLAGS@ -DBSTUB
+AM_CFLAGS = @CFLAGS@ -DBSTUB
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/AplusGUI/Makefile.am.org aplus-fsf-4.22/src/AplusGUI/Makefile.am
--- aplus-fsf-4.22/src/AplusGUI/Makefile.am.org 2001-01-30 21:48:35.000000000 +0100
+++ aplus-fsf-4.22/src/AplusGUI/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -125,5 +125,7 @@ libAplusGUI_la_SOURCES= \
EnumTables.H\
Macros.H
+libAplusGUI_la_LIBADD = -L../MSGUI -L../MSTypes -L../MSIPC -L../esf -lMSGUI -lMSTypes -lMSIPC -lesf -lstdc++
+
INCLUDES = -I.. -I/usr/X11R6/include
diff -up aplus-fsf-4.22/src/app-defaults/Makefile.am.org aplus-fsf-4.22/src/app-defaults/Makefile.am
--- aplus-fsf-4.22/src/app-defaults/Makefile.am.org 2001-01-22 21:35:46.000000000 +0100
+++ aplus-fsf-4.22/src/app-defaults/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-appdefaultsdir = $(prefix)/app-defaults
+appdefaultsdir = @datadir@/X11/app-defaults
appdefaults_DATA = XTerm
diff -up aplus-fsf-4.22/src/autils/Makefile.am.org aplus-fsf-4.22/src/autils/Makefile.am
--- aplus-fsf-4.22/src/autils/Makefile.am.org 2008-04-08 22:07:32.000000000 +0200
+++ aplus-fsf-4.22/src/autils/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-autilsdir = $(prefix)/autils
+autilsdir = ${datadir}/aplus-fsf
autils_DATA = \
README \
diff -up aplus-fsf-4.22/src/cxb/Makefile.am.org aplus-fsf-4.22/src/cxb/Makefile.am
--- aplus-fsf-4.22/src/cxb/Makefile.am.org 2001-01-19 22:28:09.000000000 +0100
+++ aplus-fsf-4.22/src/cxb/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -13,5 +13,7 @@ lib_LTLIBRARIES = libcxb.la
libcxb_la_SOURCES = \
binary.c
+libcxb_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/cxc/Makefile.am.org aplus-fsf-4.22/src/cxc/Makefile.am
--- aplus-fsf-4.22/src/cxc/Makefile.am.org 2001-01-19 22:28:18.000000000 +0100
+++ aplus-fsf-4.22/src/cxc/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -15,5 +15,7 @@ libcxc_la_SOURCES = \
cform.c \
cxc.h
+libcxc_la_LIBADD = -L../a -la
+
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/cxs/Makefile.am.org aplus-fsf-4.22/src/cxs/Makefile.am
--- aplus-fsf-4.22/src/cxs/Makefile.am.org 2008-04-08 21:26:32.000000000 +0200
+++ aplus-fsf-4.22/src/cxs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -12,6 +12,8 @@ lib_LTLIBRARIES = libcxs.la
libcxs_la_SOURCES = S.c
+libcxs_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
sdir = $(libdir)
diff -up aplus-fsf-4.22/src/cxsys/Makefile.am.org aplus-fsf-4.22/src/cxsys/Makefile.am
--- aplus-fsf-4.22/src/cxsys/Makefile.am.org 2001-01-19 22:28:29.000000000 +0100
+++ aplus-fsf-4.22/src/cxsys/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -20,5 +20,7 @@ libcxsys_la_SOURCES = \
impexp.c \
impexp.h
+libcxsys_la_LIBADD = -L../a -L../dap -L../cxc -la -ldap -lcxc
+
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/esf/Makefile.am.org aplus-fsf-4.22/src/esf/Makefile.am
--- aplus-fsf-4.22/src/esf/Makefile.am.org 2001-01-19 22:28:59.000000000 +0100
+++ aplus-fsf-4.22/src/esf/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -24,5 +24,7 @@ libesf_la_SOURCES = \
kcheck.c \
dyld2.c
+libesf_la_LIBADD = -L../a -L../dap -la -ldap
+
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org aplus-fsf-4.22/src/fonts/TrueType/Makefile.am
--- aplus-fsf-4.22/src/fonts/TrueType/Makefile.am.org 2001-01-19 22:10:06.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/TrueType/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-TrueTypedir = $(prefix)/fonts/TrueType
+TrueTypedir = @datadir@/fonts/apl/TrueType
TrueType_DATA = KAPL.TTF
diff -up aplus-fsf-4.22/src/fonts/X11/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/Makefile.am.org 2001-01-19 22:10:32.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/X11/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,4 +8,4 @@
## ##
###############################################################################
-SUBDIRS = pcf bdf
+SUBDIRS = pcf
diff -up aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am
--- aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am.org 2001-01-19 22:11:24.000000000 +0100
+++ aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-fonts_pcfdir = $(prefix)/fonts/X11/pcf
+fonts_pcfdir = @datadir@/fonts/apl/pcf
fonts_pcf_DATA = \
Kapl.alias \
diff -up aplus-fsf-4.22/src/html/Makefile.am.org aplus-fsf-4.22/src/html/Makefile.am
--- aplus-fsf-4.22/src/html/Makefile.am.org 2001-10-06 23:49:48.000000000 +0200
+++ aplus-fsf-4.22/src/html/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -10,7 +10,7 @@
SUBDIRS = tutorials
-htmldir = $(prefix)/doc/html
+htmldir = @docdir@/html
html_DATA = \
A-head3.gif \
@@ -754,5 +754,5 @@ EXTRA_DIST = \
window.gif
install-exec-hook:
- rm -f $(DESTDIR)$(prefix)/doc/html/index.html
- ln -s refman.html $(DESTDIR)$(prefix)/doc/html/index.html
+ rm -f $(DESTDIR)$/@docdir@/html/index.html
+ ln -s refman.html $(DESTDIR)/@docdir@/html/index.html
diff -up aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am.org 2001-01-19 18:57:30.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-graphsdir = $(prefix)/doc/html/tutorials/graphs
+graphsdir = @docdir@/html/tutorials/graphs
graphs_DATA = \
graph_tutorial.html
diff -up aplus-fsf-4.22/src/html/tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/Makefile.am.org 2001-01-19 18:58:36.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -10,7 +10,7 @@
SUBDIRS = graphs s.tutorials
-tutorialsdir = $(prefix)/doc/html/tutorials
+tutorialsdir = @docdir@/html/tutorials
tutorials_DATA = \
Assignment.html \
diff -up aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am.org 2001-01-19 18:56:56.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-s_tutorialsdir = $(prefix)/doc/html/tutorials/s.tutorials
+s_tutorialsdir = @docdir@/html/tutorials/s.tutorials
s_tutorials_DATA = \
buttons.html \
diff -up aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am
--- aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am.org 2002-01-24 21:33:42.000000000 +0100
+++ aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -10,7 +10,7 @@
SUBDIRS = files
-t_tutorialsdir = $(prefix)/doc/html/tutorials/t.tutorial
+t_tutorialsdir = @docdir@/html/tutorials/t.tutorial
t_tutorials_DATA = \
README \
diff -up aplus-fsf-4.22/src/IPC/Makefile.am.org aplus-fsf-4.22/src/IPC/Makefile.am
--- aplus-fsf-4.22/src/IPC/Makefile.am.org 2008-04-08 21:25:50.000000000 +0200
+++ aplus-fsf-4.22/src/IPC/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -52,6 +52,8 @@ libIPC_la_SOURCES = \
pString_Connection.H\
pString_Listener.H
+libIPC_la_LIBADD = -L../MSTypes -L../MSIPC -L../a -lMSTypes -L../cxsys -L../dap -lMSIPC -la -lstdc++ -lcxsys -ldap
+
INCLUDES = -I..
idapdir = $(libdir)
diff -up aplus-fsf-4.22/src/lisp.0/Makefile.in.org aplus-fsf-4.22/src/lisp.0/Makefile.in
--- aplus-fsf-4.22/src/lisp.0/Makefile.in.org 2008-04-08 22:15:29.000000000 +0200
+++ aplus-fsf-4.22/src/lisp.0/Makefile.in 2008-09-09 16:38:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,84 +16,159 @@
###############################################################################
###############################################################################
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/lisp.0
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(lisp0dir)"
+lisp0DATA_INSTALL = $(INSTALL_DATA)
+DATA = $(lisp0_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-AS = @AS@
+APLVERSION = @APLVERSION@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XMKMF = @XMKMF@
X_INCLUDES = @X_INCLUDES@
X_LIBS = @X_LIBS@
+X_PREFIX = @X_PREFIX@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
-
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
lisp0dir = $(prefix)/lisp.0
-
lisp0_DATA = \
.emacs \
a.el \
@@ -101,7 +176,6 @@ lisp0_DATA = \
keyb.el \
xa.el
-
EXTRA_DIST = \
.emacs \
a.el \
@@ -109,68 +183,84 @@ EXTRA_DIST = \
keyb.el \
xa.el
-subdir = src/lisp.0
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(lisp0_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lisp.0/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/lisp.0/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ $(AUTOMAKE) --gnu src/lisp.0/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-lisp0DATA_INSTALL = $(INSTALL_DATA)
install-lisp0DATA: $(lisp0_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(lisp0dir)
+ test -z "$(lisp0dir)" || $(MKDIR_P) "$(DESTDIR)$(lisp0dir)"
@list='$(lisp0_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f"; \
- $(lisp0DATA_INSTALL) $$d$$p $(DESTDIR)$(lisp0dir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(lisp0DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lisp0dir)/$$f'"; \
+ $(lisp0DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lisp0dir)/$$f"; \
done
uninstall-lisp0DATA:
@$(NORMAL_UNINSTALL)
@list='$(lisp0_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(lisp0dir)/$$f"; \
- rm -f $(DESTDIR)$(lisp0dir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(lisp0dir)/$$f'"; \
+ rm -f "$(DESTDIR)$(lisp0dir)/$$f"; \
done
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -184,10 +274,10 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(lisp0dir)
-
+ for dir in "$(DESTDIR)$(lisp0dir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -199,7 +289,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -207,7 +297,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -217,46 +307,68 @@ clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am: install-lisp0DATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-uninstall-am: uninstall-info-am uninstall-lisp0DATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-lisp0DATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-lisp0DATA install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
- uninstall-lisp0DATA
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-lisp0DATA install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-lisp0DATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -up aplus-fsf-4.22/src/lisp.1/Makefile.am.org aplus-fsf-4.22/src/lisp.1/Makefile.am
--- aplus-fsf-4.22/src/lisp.1/Makefile.am.org 2001-03-09 23:38:09.000000000 +0100
+++ aplus-fsf-4.22/src/lisp.1/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,10 +8,9 @@
## ##
###############################################################################
-lisp1dir = $(prefix)/lisp.1
+lisp1dir = $(datadir)/xemacs/site-packages/lisp/aplus-fsf
lisp1_DATA = \
- .emacs \
a.el \
a-font.el \
aplus.el \
@@ -19,7 +18,6 @@ lisp1_DATA = \
xa.el
EXTRA_DIST = \
- .emacs \
a.el \
a-font.el \
aplus.el \
diff -up aplus-fsf-4.22/src/main/aplus_main.c.org aplus-fsf-4.22/src/main/aplus_main.c
--- aplus-fsf-4.22/src/main/aplus_main.c.org 2008-04-08 21:16:29.000000000 +0200
+++ aplus-fsf-4.22/src/main/aplus_main.c 2008-09-09 16:37:58.000000000 +0200
@@ -64,7 +64,7 @@ static C *_releaseCode = RELEASE_CODE;
static C *_whoseTree = "";
static C *_banner = BANNER;
static C *_copyright = COPYRIGHT;
-static C *_defaultATREE = (char *)0;
+static C *_defaultATREE = (char *)"/usr/lib/a+";
static C *_version = (char *)0;
static C *usage = "usage: a+ [-d display] [-s] [-w workarea] [-q] [-h megsforheap] [-m atmpMode] [script [args]]\n";
static I _enable_coredump;
diff -up aplus-fsf-4.22/src/main/Makefile.am.org aplus-fsf-4.22/src/main/Makefile.am
--- aplus-fsf-4.22/src/main/Makefile.am.org 2005-08-29 03:32:27.000000000 +0200
+++ aplus-fsf-4.22/src/main/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -21,7 +21,7 @@ aplus_SOURCES = \
matherr.c \
version.h
-CFLAGS = @CFLAGS@ -DBSTUB
+AM_CFLAGS = @CFLAGS@ -DBSTUB
INCLUDES = -I.. $(X_INCLUDES)
diff -up aplus-fsf-4.22/src/Makefile.am.org aplus-fsf-4.22/src/Makefile.am
--- aplus-fsf-4.22/src/Makefile.am.org 2008-04-08 20:58:18.000000000 +0200
+++ aplus-fsf-4.22/src/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -9,18 +9,18 @@
###############################################################################
SUBDIRS = \
- IPC \
+ a \
+ cxc \
+ MSTypes \
+ dap \
+ cxsys \
cxs \
cxb \
- AplusGUI \
- cxsys \
- cxc \
esf \
- a \
- dap \
- MSGUI \
MSIPC \
- MSTypes \
+ IPC \
+ MSGUI \
+ AplusGUI \
main \
html \
contrib \
diff -up aplus-fsf-4.22/src/MSGUI/Makefile.am.org aplus-fsf-4.22/src/MSGUI/Makefile.am
--- aplus-fsf-4.22/src/MSGUI/Makefile.am.org 2001-01-30 21:49:25.000000000 +0100
+++ aplus-fsf-4.22/src/MSGUI/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -382,6 +382,8 @@ libMSGUI_la_SOURCES = \
MSWidgetView.H\
MSWindow.H
+libMSGUI_la_LIBADD = -L../MSTypes -L../MSIPC -L../dap -lMSTypes -lMSIPC -ldap -lX11 -lstdc++
+
EXTRA_DIST = \
MSArrayViewInlines.C\
MSCompositeTextInlines.C\
diff -up aplus-fsf-4.22/src/MSIPC/Makefile.am.org aplus-fsf-4.22/src/MSIPC/Makefile.am
--- aplus-fsf-4.22/src/MSIPC/Makefile.am.org 2001-01-19 21:44:13.000000000 +0100
+++ aplus-fsf-4.22/src/MSIPC/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -52,6 +52,8 @@ libMSIPC_la_SOURCES = \
MSTimer.H\
MSTv.H
+libMSIPC_la_LIBADD = -L../MSTypes -lMSTypes
+
EXTRA_DIST = MSProtocolConnection.C
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/MSTypes/Makefile.am.org aplus-fsf-4.22/src/MSTypes/Makefile.am
--- aplus-fsf-4.22/src/MSTypes/Makefile.am.org 2001-01-19 21:46:18.000000000 +0100
+++ aplus-fsf-4.22/src/MSTypes/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -298,8 +298,7 @@ EXTRA_DIST = \
MSTypeMatrix.C\
MSTypeVector.C
-
-
+libMSTypes_la_LIBADD = -L../a -la -lstdc++
INCLUDES = -I..
diff -up aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org aplus-fsf-4.22/src/tutorials/graphs/Makefile.am
--- aplus-fsf-4.22/src/tutorials/graphs/Makefile.am.org 2001-01-23 15:12:00.000000000 +0100
+++ aplus-fsf-4.22/src/tutorials/graphs/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-graphsdir = $(prefix)/doc/tutorials/graphs
+graphsdir = @docdir@/tutorials/graphs
graphs_DATA = \
graph_data.m \
diff -up aplus-fsf-4.22/src/tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/Makefile.am.org 2008-04-01 22:02:51.000000000 +0200
+++ aplus-fsf-4.22/src/tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -10,7 +10,7 @@
SUBDIRS = graphs s.tutorials
-tutorialsdir = $(prefix)/doc/tutorials
+tutorialsdir = @docdir@/tutorials
tutorials_DATA = \
Assignment \
diff -up aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am
--- aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am.org 2001-01-23 15:13:08.000000000 +0100
+++ aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am 2008-09-09 16:37:58.000000000 +0200
@@ -8,7 +8,7 @@
## ##
###############################################################################
-s_tutorialsdir = $(prefix)/doc/tutorials/s.tutorials
+s_tutorialsdir = @docdir@/tutorials/s.tutorials
s_tutorials_DATA = \
aux_vars.+ \
Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- aplus-fsf.spec 10 Sep 2008 15:59:18 -0000 1.27
+++ aplus-fsf.spec 17 Nov 2008 19:53:38 -0000 1.28
@@ -15,7 +15,7 @@
Name: %name
Version: 4.22.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Summary: Advanced APL interpreter with s interface
@@ -26,7 +26,7 @@
Source: http://www.aplusdev.org/Download/%name-%ver-%rel.tar.gz
Source1: aplus-fsf-4.20-elstart
Source2: aplus-fsf.wrapper
-Patch1: aplus-fsf-4.22.3-makefile.patch
+Patch1: aplus-fsf-4.22.4-makefile.patch
Patch3: aplus-fsf-4.20-el.patch
Patch4: aplus-fsf-4.22.3-atree.patch
@@ -241,6 +241,9 @@
%{catalogue}/apl-truetype
%Changelog
+* Mon Nov 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-5
+- Try to fix build issue agains libtools-2
+
* Wed Sep 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-4
- Add forgotten file into cvs
--- aplus-fsf-4.22.3-makefile.patch DELETED ---
- Previous message: rpms/fwknop/devel fwknop-1.9.9-hostname.patch, NONE, 1.1 fwknop.spec, 1.4, 1.5 fwknop-1.9.6-hostname.patch, 1.1, NONE
- Next message: rpms/ktorrent/devel .cvsignore, 1.24, 1.25 ktorrent.spec, 1.80, 1.81 sources, 1.24, 1.25 ktorrent-3.1.4-kdeinit.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list