fix nls' that didnt build
Dana Jansens danakj@orodu.net
4 files changed,
45 insertions(+),
33 deletions(-)
M
nls/es_AR/Makefile.am
→
nls/es_AR/Makefile.am
@@ -3,32 +3,35 @@
NLSTEST = @NLS@ THE_LANG = es_AR THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ +all-local: openbox.cat +install-data-local: openbox.cat + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ + ln -f -s es_AR $(DESTDIR)$(pkgdatadir)/nls/es; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + @if test x$(NLSTEST) = "xyes"; then \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ +openbox.cat: Translation.m + @if test x$(NLSTEST) = "xyes"; then \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local:
M
nls/no_NO/Makefile.am
→
nls/no_NO/Makefile.am
@@ -3,32 +3,35 @@
NLSTEST = @NLS@ THE_LANG = no_NO THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ +all-local: openbox.cat +install-data-local: openbox.cat + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/no; \ + ln -f -s no_NO $(DESTDIR)$(pkgdatadir)/nls/no; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + @if test x$(NLSTEST) = "xyes"; then \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/no; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ +openbox.cat: Translation.m + @if test x$(NLSTEST) = "xyes"; then \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local:
M
nls/pt_BR/Makefile.am
→
nls/pt_BR/Makefile.am
@@ -14,10 +14,13 @@ @if test x$(NLSTEST) = "xyes"; then \
echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/pt; \ + ln -f -s pt_BR $(DESTDIR)$(pkgdatadir)/nls/pt; \ fi uninstall-local: @if test x$(NLSTEST) = "xyes"; then \ rm -f $(THE_NLS_PATH)/openbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/pt; \ rmdir $(THE_NLS_PATH); \ fi
M
nls/ro_RO/Makefile.am
→
nls/ro_RO/Makefile.am
@@ -3,32 +3,35 @@
NLSTEST = @NLS@ THE_LANG = ro_RO THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat - @if test x$(NLSTEST) = "x-DNLS"; then \ +all-local: openbox.cat +install-data-local: openbox.cat + @if test x$(NLSTEST) = "xyes"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/ro; \ + ln -f -s ro_RO $(DESTDIR)$(pkgdatadir)/nls/ro; \ fi uninstall-local: - @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + @if test x$(NLSTEST) = "xyes"; then \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/ro; \ rmdir $(THE_NLS_PATH); \ fi Translation.m: $(MFILES) - @if test x$(NLSTEST) = "x-DNLS"; then \ + @if test x$(NLSTEST) = "xyes"; then \ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m - @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ +openbox.cat: Translation.m + @if test x$(NLSTEST) = "xyes"; then \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: