]>
Commit | Line | Data |
---|---|---|
84ddce18 AM |
1 | diff -urN anjuta-0.1.8.org/Makefile.am anjuta-0.1.8/Makefile.am |
2 | --- anjuta-0.1.8.org/Makefile.am Thu Dec 6 21:34:49 2001 | |
3 | +++ anjuta-0.1.8/Makefile.am Thu Dec 6 22:38:59 2001 | |
4 | @@ -27,13 +27,15 @@ | |
5 | xml-i18n-update.in \ | |
6 | $(anjutadoc_DATA) | |
7 | ||
8 | -@XML_I18N_MERGE_DESKTOP_RULE@ | |
9 | +@XML_I18N_MERGE_DESKTOP_RULE1@ | |
10 | ||
11 | gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@/Development | |
12 | ||
13 | gnomemenu_premerge_file = anjuta.desktop.in | |
14 | gnomemenu_DATA = $(gnomemenu_premerge_file:.desktop.in=.desktop) | |
15 | ||
16 | +anjuta.desktop: | |
17 | + | |
18 | # Copy all the spec files. Of cource, only one is actually used. | |
19 | dist-hook: | |
20 | for specfile in *.spec; do \ | |
21 | diff -urN anjuta-0.1.8.org/configure.in anjuta-0.1.8/configure.in | |
22 | --- anjuta-0.1.8.org/configure.in Thu Dec 6 21:34:49 2001 | |
23 | +++ anjuta-0.1.8/configure.in Thu Dec 6 21:45:02 2001 | |
24 | @@ -268,7 +268,7 @@ | |
25 | ||
26 | dnl Languages which your application supports | |
27 | ALL_LINGUAS="de es fr it ja nl no pl pt_BR ru sv ta tr uk zh_CN zh_TW" | |
28 | -AM_GNOME_GETTEXT | |
29 | +AM_GNU_GETTEXT | |
30 | ||
31 | dnl Set PACKAGE_LOCALE_DIR in config.h. | |
32 | if test "x${prefix}" = "xNONE"; then | |
33 | diff -urN anjuta-0.1.8.org/data/Makefile.am anjuta-0.1.8/data/Makefile.am | |
34 | --- anjuta-0.1.8.org/data/Makefile.am Thu Dec 6 21:34:50 2001 | |
35 | +++ anjuta-0.1.8/data/Makefile.am Thu Dec 6 22:55:58 2001 | |
36 | @@ -33,15 +33,15 @@ | |
37 | ||
38 | install-data-local: | |
39 | mkdir -p $(MACROS_dir) | |
40 | - $(INSTALL_DATA) $(MACROS:%=$(top_srcdir)/macros/%) $(MACROS_dir) | |
41 | + $(INSTALL_DATA) $(MACROS:%=$(top_srcdir)/macros/%) $(DESTDIR)$(MACROS_dir) | |
42 | ||
43 | uninstall-local: | |
44 | @rm -fv $(MACROS:%=$(MACROS_dir)/%) | |
45 | - if test -d $(MACROS_dir); then \ | |
46 | - rmdir $(MACROS_dir); \ | |
47 | + if test -d $(DESTDIR)$(MACROS_dir); then \ | |
48 | + rmdir $(DESTDIR)$(MACROS_dir); \ | |
49 | \ | |
50 | - if test -d $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@; then \ | |
51 | - rmdir $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@; \ | |
52 | + if test -d $(DESTDIR)$(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@; then \ | |
53 | + rmdir $(DESTDIR)$(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@; \ | |
54 | fi; \ | |
55 | fi | |
56 | ||
57 | diff -urN anjuta-0.1.8.org/manuals/sgmldocs.make anjuta-0.1.8/manuals/sgmldocs.make | |
58 | --- anjuta-0.1.8.org/manuals/sgmldocs.make Thu Dec 6 21:34:49 2001 | |
59 | +++ anjuta-0.1.8/manuals/sgmldocs.make Thu Dec 6 21:36:52 2001 | |
60 | @@ -53,7 +53,7 @@ | |
61 | -cp $(docname)/index.html . | |
62 | ||
63 | $(docname).sgml: $(sgml_ents) | |
64 | - -ourdir=`pwd`; \ | |
65 | + ourdir=`pwd`; \ | |
66 | cd $(srcdir); \ | |
67 | cp $(sgml_ents) $$ourdir | |
68 |