projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
053934c
)
Revert. Libs installed in /usr/lib (again). Minor tweaks for
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Jun 2006 13:47:52 +0000
(13:47 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Jun 2006 13:47:52 +0000
(13:47 +0000)
Debian rules.
13 files changed:
bfile/Makefile.am
patch
|
blob
|
history
data1/Makefile.am
patch
|
blob
|
history
debian/control
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
dfa/Makefile.am
patch
|
blob
|
history
dict/Makefile.am
patch
|
blob
|
history
index/Makefile.am
patch
|
blob
|
history
isamb/Makefile.am
patch
|
blob
|
history
isamc/Makefile.am
patch
|
blob
|
history
isams/Makefile.am
patch
|
blob
|
history
recctrl/Makefile.am
patch
|
blob
|
history
rset/Makefile.am
patch
|
blob
|
history
util/Makefile.am
patch
|
blob
|
history
diff --git
a/bfile/Makefile.am
b/bfile/Makefile.am
index
16908e7
..
e495164
100644
(file)
--- a/
bfile/Makefile.am
+++ b/
bfile/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.7 2006-06-29 09:10:29 adam Exp $
+## $Id: Makefile.am,v 1.8 2006-06-29 13:47:52 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-bfile.la
+lib_LTLIBRARIES = libidzebra-bfile.la
check_PROGRAMS = tstbfile1
check_PROGRAMS = tstbfile1
diff --git
a/data1/Makefile.am
b/data1/Makefile.am
index
81410e5
..
54e28fa
100644
(file)
--- a/
data1/Makefile.am
+++ b/
data1/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.4 2006-06-29 09:10:33 adam Exp $
+## $Id: Makefile.am,v 1.5 2006-06-29 13:47:52 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES=libidzebra-data1.la
+lib_LTLIBRARIES=libidzebra-data1.la
libidzebra_data1_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_data1_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c \
libidzebra_data1_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_data1_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c \
diff --git
a/debian/control
b/debian/control
index
3198633
..
ddc88e3
100644
(file)
--- a/
debian/control
+++ b/
debian/control
@@
-63,7
+63,7
@@
Section: devel
Architecture: any
Depends: libidzebra-2.0 (= ${Source-Version})
Description: IDZebra development
Architecture: any
Depends: libidzebra-2.0 (= ${Source-Version})
Description: IDZebra development
- This package contains IDZebra development files, such as libraries
+ This package contains development files for IDZebra, such as libraries
and header files.
.
IDZebra is a high-performance, general-purpose structured text indexing
and header files.
.
IDZebra is a high-performance, general-purpose structured text indexing
@@
-74,7
+74,7
@@
Description: IDZebra development
Package: libidzebra-2.0
Section: libs
Architecture: any
Package: libidzebra-2.0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, idzebra-2.0-common
+Depends: ${shlibs:Depends}
Conflicts: idzebra
Description: IDZebra libraries
This package contains all run-time libraries for IDZebra.
Conflicts: idzebra
Description: IDZebra libraries
This package contains all run-time libraries for IDZebra.
diff --git
a/debian/rules
b/debian/rules
index
160c4f2
..
f6c3952
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-45,13
+45,12
@@
clean:
# Add here commands to clean up after the build process.
-$(MAKE) -j8 distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
# Add here commands to clean up after the build process.
-$(MAKE) -j8 distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- if [! -f config.sub] ; then cp -f /usr/share/misc/config.sub config.sub ; fi
+ if test ! -f config.sub; then cp -f /usr/share/misc/config.sub config.sub ; fi
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- if [! -f config.guess] ; then cp -f /usr/share/misc/config.guess config.guess ; fi
+ if test ! -f config.guess ; then cp -f /usr/share/misc/config.guess config.guess ; fi
endif
endif
-
dh_clean
install: build
dh_clean
install: build
@@
-94,7
+93,7
@@
binary-arch: build install
# dh_python
dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.0)' -X mod-
dh_installdeb
# dh_python
dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.0)' -X mod-
dh_installdeb
- dh_shlibdeps -l debian/libidzebra-2.0/usr/lib
+ dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git
a/dfa/Makefile.am
b/dfa/Makefile.am
index
17828c3
..
e911a36
100644
(file)
--- a/
dfa/Makefile.am
+++ b/
dfa/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.8 2006-06-29 09:10:34 adam Exp $
+## $Id: Makefile.am,v 1.9 2006-06-29 13:47:54 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-dfa.la
+lib_LTLIBRARIES = libidzebra-dfa.la
noinst_PROGRAMS = agrep lexer grepper
noinst_PROGRAMS = agrep lexer grepper
diff --git
a/dict/Makefile.am
b/dict/Makefile.am
index
f77b47e
..
4a20766
100644
(file)
--- a/
dict/Makefile.am
+++ b/
dict/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.14 2006-06-29 09:10:35 adam Exp $
+## $Id: Makefile.am,v 1.15 2006-06-29 13:47:55 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-dict.la
+lib_LTLIBRARIES = libidzebra-dict.la
noinst_PROGRAMS = dicttest dictext
check_PROGRAMS = scantest
noinst_PROGRAMS = dicttest dictext
check_PROGRAMS = scantest
diff --git
a/index/Makefile.am
b/index/Makefile.am
index
edaab35
..
b29b759
100644
(file)
--- a/
index/Makefile.am
+++ b/
index/Makefile.am
@@
-1,10
+1,8
@@
-## $Id: Makefile.am,v 1.46 2006-06-29 09:10:37 adam Exp $
-
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+## $Id: Makefile.am,v 1.47 2006-06-29 13:47:57 adam Exp $
noinst_PROGRAMS = apitest kdump zebrash
noinst_PROGRAMS = apitest kdump zebrash
-zebralib_LTLIBRARIES = libidzebra-api.la
+lib_LTLIBRARIES = libidzebra-api.la
libidzebra_api_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_api_la_SOURCES = \
libidzebra_api_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_api_la_SOURCES = \
diff --git
a/isamb/Makefile.am
b/isamb/Makefile.am
index
5871c30
..
f09dce2
100644
(file)
--- a/
isamb/Makefile.am
+++ b/
isamb/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.10 2006-06-29 09:10:38 adam Exp $
+## $Id: Makefile.am,v 1.11 2006-06-29 13:47:58 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-isamb.la
+lib_LTLIBRARIES = libidzebra-isamb.la
check_PROGRAMS = tstisamb
check_PROGRAMS = tstisamb
diff --git
a/isamc/Makefile.am
b/isamc/Makefile.am
index
c77aad8
..
64d7fb0
100644
(file)
--- a/
isamc/Makefile.am
+++ b/
isamc/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.9 2006-06-29 09:10:40 adam Exp $
+## $Id: Makefile.am,v 1.10 2006-06-29 13:48:00 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-isamc.la
+lib_LTLIBRARIES = libidzebra-isamc.la
libidzebra_isamc_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h
libidzebra_isamc_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h
diff --git
a/isams/Makefile.am
b/isams/Makefile.am
index
1713ccb
..
a12f8b2
100644
(file)
--- a/
isams/Makefile.am
+++ b/
isams/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.5 2006-06-29 09:10:41 adam Exp $
+## $Id: Makefile.am,v 1.6 2006-06-29 13:48:02 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-isams.la
+lib_LTLIBRARIES = libidzebra-isams.la
AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
diff --git
a/recctrl/Makefile.am
b/recctrl/Makefile.am
index
042e41e
..
4a76272
100644
(file)
--- a/
recctrl/Makefile.am
+++ b/
recctrl/Makefile.am
@@
-1,6
+1,4
@@
-## $Id: Makefile.am,v 1.25 2006-06-29 09:10:42 adam Exp $
-
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+## $Id: Makefile.am,v 1.26 2006-06-29 13:48:04 adam Exp $
modlibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)/modules
modlibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)/modules
@@
-45,7
+43,7
@@
EXTRA_LTLIBRARIES = \
mod-alvis.la
# The common library
mod-alvis.la
# The common library
-zebralib_LTLIBRARIES = libidzebra-recctrl.la
+lib_LTLIBRARIES = libidzebra-recctrl.la
libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c
libidzebra_recctrl_la_LDFLAGS = -export-dynamic -version-info $(ZEBRALIBS_VERSION)
libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \
libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c
libidzebra_recctrl_la_LDFLAGS = -export-dynamic -version-info $(ZEBRALIBS_VERSION)
libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \
diff --git
a/rset/Makefile.am
b/rset/Makefile.am
index
6fbdb7a
..
740835d
100644
(file)
--- a/
rset/Makefile.am
+++ b/
rset/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.15 2006-06-29 09:10:44 adam Exp $
+## $Id: Makefile.am,v 1.16 2006-06-29 13:48:05 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-rset.la
+lib_LTLIBRARIES = libidzebra-rset.la
libidzebra_rset_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_rset_la_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \
libidzebra_rset_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
libidzebra_rset_la_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \
diff --git
a/util/Makefile.am
b/util/Makefile.am
index
57e9811
..
72832ad
100644
(file)
--- a/
util/Makefile.am
+++ b/
util/Makefile.am
@@
-1,8
+1,6
@@
-## $Id: Makefile.am,v 1.20 2006-06-29 09:10:47 adam Exp $
+## $Id: Makefile.am,v 1.21 2006-06-29 13:48:07 adam Exp $
-zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
-
-zebralib_LTLIBRARIES = libidzebra-util.la
+lib_LTLIBRARIES = libidzebra-util.la
noinst_PROGRAMS = passtest
noinst_PROGRAMS = passtest