Commit 4ccecb53 authored by Elliot Lee's avatar Elliot Lee

Fix the .spec file to include correct documentation pieces. Work with



* gnumeric.spec.in: Fix the .spec file to include correct documentation pieces.
* doc/C/Makefile.am: Work with builddir != srcdir
* plugins/lotus-123/Makefile.am: boot.h not needed. lotus-types.h is.
* plugins/xbase/Makefile.am: boot.h not needed.
* po/Makefile.in.in: v3
* src/corba-sheet.c: Use a compilable thing for error string.
* src/Makefile.am: Be -j safe.
parent 6228cbaf
1999-08-02 Elliot Lee <sopwith@redhat.com>
* gnumeric.spec.in: Fix the .spec file to include correct documentation pieces.
* doc/C/Makefile.am: Work with builddir != srcdir
* plugins/lotus-123/Makefile.am: boot.h not needed. lotus-types.h is.
* plugins/xbase/Makefile.am: boot.h not needed.
* po/Makefile.in.in: v3
* src/corba-sheet.c: Use a compilable thing for error string.
1999-08-02 Morten Welinder <terra@diku.dk>
* src/expr.c (eval_expr_real): Plug leak...
......
1999-08-02 Elliot Lee <sopwith@redhat.com>
* gnumeric.spec.in: Fix the .spec file to include correct documentation pieces.
* doc/C/Makefile.am: Work with builddir != srcdir
* plugins/lotus-123/Makefile.am: boot.h not needed. lotus-types.h is.
* plugins/xbase/Makefile.am: boot.h not needed.
* po/Makefile.in.in: v3
* src/corba-sheet.c: Use a compilable thing for error string.
1999-08-02 Morten Welinder <terra@diku.dk>
* src/expr.c (eval_expr_real): Plug leak...
......
......@@ -64,10 +64,10 @@ make-func.defs:
dist-hook:
mkdir $(distdir)/gnumeric
-cp gnumeric/*.html gnumeric/*.css $(distdir)/gnumeric
-cp gnumeric.html $(distdir)
-cp $(srcdir)/gnumeric/*.html gnumeric/*.css $(distdir)/gnumeric
-cp $(srcdir)/gnumeric.html $(distdir)
mkdir $(distdir)/images
-cp images/*.gif images/*.jpg $(distdir)/images
-cp $(srcdir)/images/*.gif $(srcdir)/images/*.jpg $(distdir)/images
install-data-local: gnumeric.html
$(mkinstalldirs) $(gnumeric_helpdir)/images
......
......@@ -37,13 +37,12 @@ usability. Hopefully we left the bugs behind :).
%ifarch alpha
MYARCH_FLAGS="--host=alpha-redhat-linux"
%endif
./configure --prefix=%prefix $MYARCH_FLAGS --sysconfdir=/etc
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix $MYARCH_FLAGS --sysconfdir=/etc
if [ "$SMP" != "" ]; then
(make "MAKE=make -k -j $SMP"; exit 0)
make
make -j$SMP "MAKE=make -j$SMP"
else
make
make
fi
%install
......@@ -74,12 +73,10 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/lib/gnumeric/plugins/*
%{prefix}/share/locale/*/*
%{prefix}/share/gnome/apps/Applications/gnumeric.desktop
%{prefix}/share/gnome/help/gnumeric/C/*
%{prefix}/share/gnome/help/gnumeric/C/images/*
%{prefix}/share/gnome/help/gnumeric
%{prefix}/share/idl/Gnumeric.idl
%{prefix}/share/mc/templates/*
%{prefix}/share/mime-info/*
%{prefix}/share/pixmaps/*
%config /etc/CORBA/servers/*
......@@ -17,5 +17,5 @@ liblotus_la_SOURCES = \
lotus.h \
lotus-types.h \
lotus-formula.c \
lotus-formula.h
lotus-formula.h \
lotus-types.h
......@@ -13,6 +13,5 @@ plugin_LTLIBRARIES = libxbase.la
libxbase_la_SOURCES = \
boot.c \
boot.h \
xbase.c \
xbase.h
......@@ -46,7 +46,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES = cat-id-tbl.c
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = README ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \
......@@ -61,18 +61,17 @@ INSTOBJEXT = @INSTOBJEXT@
.c.o:
$(COMPILE) $<
.po.pox:
$(MAKE) $(PACKAGE).pot
%.pox: %.po $(srcdir)/$(PACKAGE).pot update-po
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
.po.mo:
%.mo: %.po update-po
$(MSGFMT) -o $@ $<
.po.gmo:
%.gmo: %.po update-po
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
%.cat: %.po update-po
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
......@@ -85,12 +84,13 @@ all-no:
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in
rm -f $(srcdir)/$(PACKAGE).pot
mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
$(srcdir)/stamp-cat-id: $(PACKAGE).pot
$(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
rm -f cat-id-tbl.tmp
sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
......@@ -109,10 +109,10 @@ install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r $(MKINSTALLDIRS); then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(datadir); \
else \
$(top_srcdir)/mkinstalldirs $(datadir); \
$(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
......@@ -123,10 +123,10 @@ install-data-yes: all
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r $(MKINSTALLDIRS); then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(top_srcdir)/mkinstalldirs $$dir; \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
......@@ -151,10 +151,10 @@ install-data-yes: all
fi; \
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r $(MKINSTALLDIRS); then \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(gettextsrcdir); \
else \
$(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
$(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(gettextsrcdir)/Makefile.in.in; \
......@@ -205,8 +205,7 @@ dist distdir: update-po $(DISTFILES)
|| cp -p $(srcdir)/$$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(PACKAGE).pot
update-po: Makefile $(srcdir)/$(PACKAGE).pot
PATH=`pwd`/../src:$$PATH; \
cd $(srcdir); \
catalogs='$(CATALOGS)'; \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -183,8 +183,6 @@ GNUMERIC_CORBA_GENERATED = \
Gnumeric-skels.c \
Gnumeric-stubs.c \
Gnumeric.h
else
GNUMERIC_CORBA_GENERATED =
endif
GNUMERIC_BONOBO_SOURCES = \
......@@ -197,14 +195,20 @@ BUILT_SOURCES = $(GNUMERIC_CORBA_GENERATED)
Gnumeric-impl.o: Gnumeric.h
$(GNUMERIC_CORBA_GENERATED): Gnumeric.idl
$(GNUMERIC_CORBA_GENERATED): my_gnumeric_idl
my_gnumeric_idl: Gnumeric.idl
orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Gnumeric.idl
touch my_gnumeric_idl
gnumeric_SOURCES = \
main.c \
normal-args.c \
$(GNUMERIC_BASE_SOURCES)
corba-sheet.c corba-workbook-factory.c corba-workbook.c Gnumeric-impl.c \
embeddable-grid.c: Gnumeric.h
gnumeric_bonobo_SOURCES = \
main.c \
corba-args.c \
......@@ -270,6 +274,6 @@ glade_msgs = \
import.glade.h \
print.glade.h
EXTRA_DIST = $(idl_DATA) $(glade_DATA) $(glade_msgs) $(GNUMERIC_CORBA_GENERATED)
MYHACKAROUNDAUTOMAKE=$(shell echo $(GNUMERIC_CORBA_GENERATED))
EXTRA_DIST = $(idl_DATA) $(glade_DATA) $(glade_msgs) $(MYHACKAROUNDAUTOMAKE)
......@@ -338,7 +338,7 @@ fill_corba_value (GNOME_Gnumeric_Value *value, Sheet *sheet, CORBA_long col, COR
case VALUE_ERROR:
value->_d = GNOME_Gnumeric_VALUE_ERROR;
value->_u.error = CORBA_string_dup (cell->value->v.error.msg.str->str);
value->_u.error = CORBA_string_dup (cell->value->v.str->str);
break;
case VALUE_STRING:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment