diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2006-04-24 22:00:08 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-04-24 22:00:08 +0000 |
| commit | 888155872732d4164ec78827230f950c43e75797 (patch) | |
| tree | 7b6bcf6dc2e6ad747c3fdef27b36ece2df819a09 | |
| parent | 575055257afa476e4cf8e2d4fb0f21b63dfd2f30 (diff) | |
| download | gdm-888155872732d4164ec78827230f950c43e75797.tar.gz | |
i2006-04-14 Brian Cameron <brian.cameron@sun.com>GDM2_2_14_3
* configure.ac: Update to new release version.
* gui/Makefile.am, po/POTFILES.in: Fix gdmsetup.desktop.in.in stuff.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | gui/Makefile.am | 7 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -3,6 +3,7 @@ * Release 2.14.3: * NEWS: Updated. * configure.ac: Update to new release version. + * gui/Makefile.am, po/POTFILES.in: Fix gdmsetup.desktop.in.in stuff. 2006-04-20 Brian Cameron <brian.cameron@sun.com> diff --git a/gui/Makefile.am b/gui/Makefile.am index 95737066..d8f7f305 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -206,11 +206,11 @@ System_files = \ gdmsetup.desktop \ gdmflexiserver.desktop \ gdmflexiserver-xnest.desktop -System_in_files = \ +System_dist_files = \ gdmsetup.desktop.in.in \ gdmflexiserver.desktop.in \ gdmflexiserver-xnest.desktop.in -System_DATA = $(System_in_files:.desktop.in=.desktop) +System_DATA = $(System_files) CLEANFILES = gdmsetup.desktop gdmsetup.desktop.in gdmflexiserver.desktop gdmflexiserver-xnest.desktop gdmphotosetup.desktop @@ -236,8 +236,7 @@ EXTRA_DIST = \ $(Glade_DATA) \ $(Icons_DATA) \ $(System_DATA) \ - $(System_files) \ - $(System_in_files) \ + $(System_dist_files) \ $(Settings_DATA) \ $(Settings_files) \ $(Settings_in_files) diff --git a/po/POTFILES.in b/po/POTFILES.in index 77ad7d2e..78066c85 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -34,7 +34,7 @@ gui/gdmphotosetup.desktop.in gui/gdmphotosetup.glade gui/gdmsession.c gui/gdmsetup.c -gui/gdmsetup.desktop.in +gui/gdmsetup.desktop.in.in gui/gdmsetup.glade gui/gdmuser.c gui/gdmwm.c |