[PATCH] Don't try and add removed file mkMakefile to distribution tarball.

[Doug Torrance]

---
 WindowMaker/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index da4dc91..e648d54 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -70,8 +70,7 @@ dist_prefsdata_DATA =\
 
 nodist_prefsdata_DATA = $(GENERATED_MENUS)
 
-EXTRA_DIST = mkMakefile\
-   $(addsuffix .in, $(GENERATED_MENUS))
+EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
 
 CLEANFILES = $(GENERATED_MENUS)
 
-- 
2.7.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[PATCH] Remove WindowMaker/mkMakefile script.

[Doug Torrance]

It was used to generate WindowMaker/Makefile.am, but hasn't been touched
since 1999.  Meanwhile, WindowMaker/Makefile.am has been changed manually
a number of times.
---
 WindowMaker/mkMakefile | 63 --
 1 file changed, 63 deletions(-)
 delete mode 100755 WindowMaker/mkMakefile

diff --git a/WindowMaker/mkMakefile b/WindowMaker/mkMakefile
deleted file mode 100755
index bd81c58..000
--- a/WindowMaker/mkMakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-#
-# Creates a Makefile.am file containing all the stuff to install 
-# wmaker data
-#
-
-
-
-
-DIRS="Backgrounds Defaults IconSets Icons Pixmaps Styles Themes"
-
-FILE=Makefile.am
-
-spit() {
-   echo -n "$*" >> $FILE
-}
-
-spitln() {
-   echo "$*" >> $FILE
-}
-
-
-
-rm -f $FILE
-
-
-
-
-spitln SUBDIRS = $DIRS
-spitln
-spitln prefsdatadir = '$(pkgdatadir)'
-spitln
-
-
-EXCEPT="Makefile.am Makefile.in Makefile mkMakefile $FILE"
-
-spit prefsdata_DATA =
-
-FILES=`ls -1|grep -v \~`
-FILES=`echo $FILES`
-
-for f in $FILES; do
-   ok=1
-   for i in $EXCEPT; do
-   if test "$i" = "$f"; then
-   ok=0
-   break
-   fi
-   done
-   if [ -f $f -a $ok = 1 ]; then
-   spitln \\
-   spit "  $f"
-   fi
-done
-
-
-spitln
-spitln
-
-spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile
-spitln
-spitln
-- 
2.7.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.7-52-gd48a37060c8b

[crmafra]

This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.

The branch, next has been updated
   via  d48a37060c8ba29eb07e6301497068d2ed0dbddd (commit)
  from  23417d99347ad60cc9535fa1d3244ed3ef7a1623 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
commit d48a37060c8ba29eb07e6301497068d2ed0dbddd
Author: Doug Torrance 
Date:   Thu, 19 Jan 2017 18:24:30 -0500
URL:

Use wprefs_bindir output variable to set WPrefs path in menus.

The path to WPrefs has been hardcoded in many of the menu files to
/usr/local/GNUstep/Applications/WPrefs.app/WPrefs, which would only actually
work if the user ran something like:
 ./configure --with-gnustepdir=/usr/local/GNUstep
during build.

Instead, we add a .in extension to all menu files with this issue and use 
sed
to use the actual WPrefs path (given by the wprefs_bindir output variable) 
and
generate a new menu file.

A very similar idea is already used to generate the WMState file, which sets
WPrefs as the command for the Window Maker logo tile in the dock.

This patch fixes Debian bug #851737:
https://bugs.debian.org/851737
---
 .gitignore| 22 ++
 WindowMaker/Makefile.am   | 72 +++
 WindowMaker/{menu.bg => menu.bg.in}   |  2 +-
 WindowMaker/{menu.fi => menu.fi.in}   |  2 +-
 WindowMaker/{menu.fy => menu.fy.in}   |  2 +-
 WindowMaker/{menu.hu => menu.hu.in}   |  2 +-
 WindowMaker/{menu => menu.in} |  2 +-
 WindowMaker/{menu.ko => menu.ko.in}   |  2 +-
 WindowMaker/{menu.nl => menu.nl.in}   |  2 +-
 WindowMaker/{menu.ro => menu.ro.in}   |  2 +-
 WindowMaker/{menu.sk => menu.sk.in}   |  2 +-
 WindowMaker/{menu.zh_TW => menu.zh_TW.in} |  2 +-
 WindowMaker/{plmenu.bg => plmenu.bg.in}   |  2 +-
 WindowMaker/{plmenu.es => plmenu.es.in}   |  2 +-
 WindowMaker/{plmenu.fi => plmenu.fi.in}   |  2 +-
 WindowMaker/{plmenu.fy => plmenu.fy.in}   |  2 +-
 WindowMaker/{plmenu => plmenu.in} |  2 +-
 WindowMaker/{plmenu.ja => plmenu.ja.in}   |  2 +-
 WindowMaker/{plmenu.ko => plmenu.ko.in}   |  2 +-
 WindowMaker/{plmenu.nl => plmenu.nl.in}   |  2 +-
 WindowMaker/{plmenu.ro => plmenu.ro.in}   |  2 +-
 WindowMaker/{plmenu.sk => plmenu.sk.in}   |  2 +-
 WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} |  2 +-
 23 files changed, 87 insertions(+), 49 deletions(-)
 rename WindowMaker/{menu.bg => menu.bg.in} (99%)
 rename WindowMaker/{menu.fi => menu.fi.in} (99%)
 rename WindowMaker/{menu.fy => menu.fy.in} (99%)
 rename WindowMaker/{menu.hu => menu.hu.in} (99%)
 rename WindowMaker/{menu => menu.in} (99%)
 rename WindowMaker/{menu.ko => menu.ko.in} (99%)
 rename WindowMaker/{menu.nl => menu.nl.in} (99%)
 rename WindowMaker/{menu.ro => menu.ro.in} (99%)
 rename WindowMaker/{menu.sk => menu.sk.in} (99%)
 rename WindowMaker/{menu.zh_TW => menu.zh_TW.in} (98%)
 rename WindowMaker/{plmenu.bg => plmenu.bg.in} (98%)
 rename WindowMaker/{plmenu.es => plmenu.es.in} (98%)
 rename WindowMaker/{plmenu.fi => plmenu.fi.in} (99%)
 rename WindowMaker/{plmenu.fy => plmenu.fy.in} (98%)
 rename WindowMaker/{plmenu => plmenu.in} (98%)
 rename WindowMaker/{plmenu.ja => plmenu.ja.in} (98%)
 rename WindowMaker/{plmenu.ko => plmenu.ko.in} (98%)
 rename WindowMaker/{plmenu.nl => plmenu.nl.in} (98%)
 rename WindowMaker/{plmenu.ro => plmenu.ro.in} (98%)
 rename WindowMaker/{plmenu.sk => plmenu.sk.in} (98%)
 rename WindowMaker/{plmenu.zh_TW => plmenu.zh_TW.in} (98%)

diff --git a/.gitignore b/.gitignore
index e50a2b774a34..f69db7333092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,28 @@ WINGs/WUtil.pc
 
 wrlib/libwraster.map
 
+WindowMaker/menu
+WindowMaker/menu.bg
+WindowMaker/menu.fi
+WindowMaker/menu.fy
+WindowMaker/menu.hu
+WindowMaker/menu.ko
+WindowMaker/menu.nl
+WindowMaker/menu.ro
+WindowMaker/menu.sk
+WindowMaker/menu.zh_TW
+WindowMaker/plmenu
+WindowMaker/plmenu.bg
+WindowMaker/plmenu.es
+WindowMaker/plmenu.fi
+WindowMaker/plmenu.fy
+WindowMaker/plmenu.ja
+WindowMaker/plmenu.ko
+WindowMaker/plmenu.nl
+WindowMaker/plmenu.ro
+WindowMaker/plmenu.sk
+WindowMaker/plmenu.zh_TW
+
 WindowMaker/Defaults/WMRootMenu
 WindowMaker/Defaults/WMState
 WindowMaker/Defaults/WMWindowAttributes
diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index 133c797bd109..da4dc91e0191 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -1,64 +1,80 @@
-SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
+SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
 
 prefsdatadir =