Skip to content

Commit f90c7bb

Browse files
committed
Remove duplicates of imported files from version control.
1 parent 54e7e48 commit f90c7bb

File tree

14 files changed

+32
-4147
lines changed

14 files changed

+32
-4147
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2016-12-04 Bruno Haible <bruno@clisp.org>
2+
3+
Remove duplicates of imported files from version control.
4+
* autogen.sh: Copy imported files to libcharset.
5+
16
2016-12-04 Bruno Haible <bruno@clisp.org>
27

38
Always use the newest released copies of files brought in from Automake.

autogen.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ fi
6868

6969
make -f Makefile.devel totally-clean all
7070

71+
# Copy files into the libcharset subpackage, so that libcharset/autogen.sh
72+
# does not need to invoke gnulib-tool nor automake.
73+
for file in INSTALL.generic; do
74+
cp -p $file libcharset/$file || exit $?
75+
done
76+
for file in config.guess config.libpath config.sub install-sh mkinstalldirs; do
77+
cp -p build-aux/$file libcharset/build-aux/$file || exit $?
78+
done
79+
for file in codeset.m4 fcntl-o.m4 glibc21.m4 relocatable-lib.m4 visibility.m4; do
80+
cp -p srcm4/$file libcharset/m4/$file || exit $?
81+
done
82+
7183
(cd libcharset
7284
./autogen.sh
7385
)

libcharset/ChangeLog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2016-12-04 Bruno Haible <bruno@clisp.org>
2+
3+
Remove imported files from version control.
4+
* INSTALL.generic: Remove from version control.
5+
* build-aux/config.guess: Likewise.
6+
* build-aux/config.libpath: Likewise.
7+
* build-aux/config.sub: Likewise.
8+
* build-aux/install-sh: Likewise.
9+
* build-aux/mkinstalldirs: Likewise.
10+
* m4/codeset.m4: Likewise.
11+
* m4/fcntl-o.m4: Likewise.
12+
* m4/glibc21.m4: Likewise.
13+
* m4/relocatable-lib.m4: Likewise.
14+
* m4/visibility.m4: Likewise.
15+
116
2016-12-03 Bruno Haible <bruno@clisp.org>
217

318
Make Makefile.devel more useful for the users of the released tarball.

libcharset/INSTALL.generic

Lines changed: 0 additions & 273 deletions
This file was deleted.

0 commit comments

Comments
 (0)