bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Fix building outside $(srcdir).

Browse source 
* Removed ./gen-mirrorlist.sh invocation from configure script:
  Mirror-files are generated by make, not configure.
This commit is contained in:
Jürgen Hötzel 2007-01-29 22:18:31 +00:00
parent 1629355ef0
commit 13f9fc4d19
8 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autoclean.sh
View file

@ -36,7 +36,6 @@ rm -rf etc/Makefile.in
rm -rf etc/Makefile rm -rf etc/Makefile
rm -rf etc/pacman.d/Makefile.in rm -rf etc/pacman.d/Makefile.in
rm -rf etc/pacman.d/Makefile rm -rf etc/pacman.d/Makefile
rm -rf etc/pacman.d/{current,extra,community,unstable,release}
rm -rf etc/abs/Makefile.in rm -rf etc/abs/Makefile.in
rm -rf etc/abs/Makefile rm -rf etc/abs/Makefile

4
configure.ac
View file

@ -364,10 +364,6 @@ bindings/perl/Makefile
bindings/python/Makefile bindings/python/Makefile
bindings/java/Makefile bindings/java/Makefile
Makefile Makefile
],
[
cd etc/pacman.d/
./gen-mirrorlist.sh
]) ])
echo " echo "

7
doc/Makefile.am
View file

@ -5,9 +5,10 @@ SUBDIRS = hu
po4a: po4a:
if HAS_PO4A if HAS_PO4A
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
po4a -k 0 po4a.cfg po4a -k 0 --variable srcdir=$(srcdir) $(srcdir)/po4a.cfg
endif endif
# DIST_SUBDIRS
if HAS_MAN2HTML if HAS_MAN2HTML
makepkg.8: makepkg.8:
man2html makepkg.8 > html/makepkg.8.html man2html makepkg.8 > html/makepkg.8.html
@ -27,7 +28,7 @@ clean:
man_MANS = pacman.8 makepkg.8 PKGBUILD.8 libalpm.3 man_MANS = pacman.8 makepkg.8 PKGBUILD.8 libalpm.3
if HAS_DOXYGEN if HAS_DOXYGEN
man_MANS += man3/*.3 man_MANS += *.3
endif endif
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS) po4a.cfg

8
doc/po4a.cfg
View file

@ -1,11 +1,11 @@
[po4a_langs] hu [po4a_langs] hu
[po4a_paths] po/pacman.pot $lang:po/$lang.po [po4a_paths] po/pacman.pot $lang:po/$lang.po
[type: man] pacman.8 \ [type: man] pacman.8 \
$lang:$lang/pacman.8 add_$lang:addendum.8.$lang \ $lang:$lang/pacman.8 add_$(srcdir)/$lang:addendum.8.$lang \
opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"
[type: man] makepkg.8 \ [type: man] makepkg.8 \
$lang:$lang/makepkg.8 add_$lang:addendum.8.$lang \ $lang:$lang/makepkg.8 add_$(srcdir)/$lang:addendum.8.$lang \
opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"
[type: man] PKGBUILD.8 \ [type: man] $(srcdir)/PKGBUILD.8 \
$lang:$lang/PKGBUILD.8 add_$lang:addendum.8.$lang \ $lang:$lang/PKGBUILD.8 add_$(srcdir)/$lang:addendum.8.$lang \
opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"

17
etc/pacman.d/Makefile.am
View file

@ -1,14 +1,9 @@
EXTRA_DIST = community current extra release unstable pkgsysconfdir = ${sysconfdir}/pacman.d
dist_pkgsysconf_DATA = community current extra release unstable
$(dist_pkgsysconf_DATA): mirrorlist
sed "s|@@REPO@@|$@|g" <$< >$@
clean: clean:
rm $(dist_pkgsysconf_DATA)
install-data-hook:
mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \
for j in $(EXTRA_DIST); do \
$(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \
done
uninstall-hook:
for j in $(EXTRA_DIST); do \
rm -f $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \
done

2
lib/libalpm/Makefile.am
View file

@ -46,6 +46,6 @@ if HAS_DOXYGEN
all: doxygen.in all: doxygen.in
doxygen.in: doxygen.in:
doxygen Doxyfile doxygen $(srcdir)/Doxyfile
endif endif

4
src/pacman/Makefile.am
View file

@ -16,10 +16,10 @@ pacman_SOURCES = util.c log.c package.c downloadprog.c trans.c add.c \
pacman_static_SOURCES = $(pacman_SOURCES) pacman_static_SOURCES = $(pacman_SOURCES)
pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \ pacman_LDADD = -L$(top_builddir)/lib/libalpm/.libs \
-ldownload -lalpm -ldownload -lalpm
pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \ pacman_static_LDADD = -L$(top_builddir)/lib/libalpm/.libs/ \
-ldownload -lalpm -ldownload -lalpm
pacman_static_LDFLAGS = $(LDFLAGS) -all-static pacman_static_LDFLAGS = $(LDFLAGS) -all-static

2
src/util/Makefile.am
View file

@ -4,4 +4,4 @@ AM_CFLAGS = -I$(top_srcdir)/lib/libalpm
vercmp_SOURCES = vercmp.c vercmp_SOURCES = vercmp.c
vercmp_LDADD = $(top_srcdir)/lib/libalpm/libalpm.la vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la