More rpm work in progress. Work around some bugs in rules.mk.

This commit is contained in:
ramiro%fateware.com 1999-10-22 05:55:29 +00:00
Родитель f939a5bb97
Коммит 153e4f95f1
4 изменённых файлов: 10 добавлений и 3 удалений

Просмотреть файл

@ -72,6 +72,8 @@ do
rm -f $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel rm -f $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
touch $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
print_cmd=$mozdir/build/package/rpm/print-module-filelist.sh print_cmd=$mozdir/build/package/rpm/print-module-filelist.sh
here=`pwd` here=`pwd`

Просмотреть файл

@ -1,9 +1,10 @@
dbm db
xpcom xpcom
intl intl
js js
modules/security/freenav modules/security/freenav
modules/libpref modules/libpref
modules/libimg modules/libimg
modules/libjar
caps caps

Просмотреть файл

@ -2,6 +2,7 @@ htmlparser
gfx gfx
dom dom
view view
widget/timer
widget widget
layout layout
webshell webshell

Просмотреть файл

@ -25,6 +25,9 @@ list2=/tmp/list2-$$.txt
rm -rf $dist $list $list2 rm -rf $dist $list $list2
mkdir -p $dist
mkdir -p $dist/include
make -s DIST=$dist XPDIST=$dist PUBLIC=$dist/include EXTRA_DEPS= >/dev/null 2>&1 make -s DIST=$dist XPDIST=$dist PUBLIC=$dist/include EXTRA_DEPS= >/dev/null 2>&1
cd $dist cd $dist
@ -49,11 +52,9 @@ do
# Dont output files in "lib/" that are duplicated in "bin/" # Dont output files in "lib/" that are duplicated in "bin/"
if [ -f "$bin_dup" ] if [ -f "$bin_dup" ]
then then
#echo "skipping $i"
skip="true" skip="true"
fi fi
# Test for files that need to be skipped # Test for files that need to be skipped
file=`basename $i` file=`basename $i`
@ -84,6 +85,8 @@ do
if [ "$skip" != "true" ] if [ "$skip" != "true" ]
then then
echo $i >> $list2 echo $i >> $list2
# else
# echo "skipping $i"
fi fi
done done