Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure.ac: assorted fixes #88

Merged
merged 3 commits into from
May 23, 2020
+4 −17
Merged

configure.ac: assorted fixes #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f935d
configure.ac: remove references to FTP
ThomasAdam May 23, 2020
b940d14
version: output fvwm3
ThomasAdam May 23, 2020
cd8b9b5
doc: remove and blacklist docbook *.ent
ThomasAdam May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ configure
core
doc/footer.html
doc/fvwm.ent
doc/fvwm3.ent
etc/
fvwm/fvwm
fvwm/fvwm3
Expand Down
10 changes: 1 addition & 9 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ RELDATENUM="2016-11-06"
# constant variable settings
FVWMNAMELONG="F? Virtual Window Manager"
FVWMHOMEPAGE="http://fvwm.org/"
FVWMFTP="ftp.fvwm.org"
FVWMFTPDIR="/pub/ftp"
FVWMALTFTP="metalab.unc.edu"
FVWMALTFTPDIR="/pub/Linux/X11/window-managers/"
FVWMLIST="fvwm@fvwm.org"
FVWMWORKERSLIST="fvwm-workers@fvwm.org"
FVWMWORKERSLISTLONG="fvwm workers list <fvwm-workers@fvwm.org>"
Expand All @@ -51,10 +47,6 @@ AC_SUBST(RELDATESHORT)
AC_SUBST(RELDATENUM)
AC_SUBST(FVWMNAMELONG)
AC_SUBST(FVWMHOMEPAGE)
AC_SUBST(FVWMFTP)
AC_SUBST(FVWMFTPDIR)
AC_SUBST(FVWMALTFTP)
AC_SUBST(FVWMALTFTPDIR)
AC_SUBST(FVWMLIST)
AC_SUBST(FVWMWORKERSLIST)
AC_SUBST(FVWMWORKERSLISTLONG)
Expand Down Expand Up @@ -1716,7 +1708,7 @@ eval my_localedir="`eval echo ${LOCALEDIR}`"
test x"$USE_NLS" = xno && my_localedir="(Not installed) $my_localdir"

echo "
Fvwm Configuration:
Fvwm3 Configuration:

Version: $VERSION$VERSIONINFO

Expand Down
6 changes: 0 additions & 6 deletions doc/fvwm3.ent
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions fvwm/fvwm3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,12 +1261,12 @@ static void setVersionInfo(void)
int support_len;

/* Set version information string */
sprintf(version_str, "fvwm %s%s compiled on %s at %s",
sprintf(version_str, "fvwm3 %s%s compiled on %s at %s",
VERSION, VERSIONINFO, __DATE__, __TIME__);
Fvwm_VersionInfo = fxstrdup(version_str);

sprintf(license_str,
"fvwm comes with NO WARRANTY, to the extent permitted by law. "
"fvwm3 comes with NO WARRANTY, to the extent permitted by law. "
"You may\nredistribute copies of fvwm under "
"the terms of the GNU General Public License.\n"
"For more information about these matters, see the file "
Expand Down