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.

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

remove fvwm-config #731

Merged
merged 1 commit into from
Oct 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ autom4te.cache/
bin/FvwmCommand
bin/FvwmPrompt/FvwmPrompt
bin/fvwm-bug
bin/fvwm-config
bin/fvwm-convert-2.4
bin/fvwm-convert-2.6
bin/fvwm-menu-desktop
Expand Down
2 changes: 1 addition & 1 deletion bin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bin_PROGRAMS = fvwm-root
fvwm_root_SOURCE= fvwm-root.c
fvwm_root_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a

bin_SCRIPTS = fvwm-config fvwm-perllib \
bin_SCRIPTS = fvwm-perllib \
fvwm-convert-2.6 \
fvwm-menu-xlock fvwm-menu-directory \
fvwm-menu-desktop \
Expand Down
19 changes: 0 additions & 19 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1391,24 +1391,6 @@ int vasprintf(char **, const char *, va_list);
#include "libs/log.h"
])

# mainly for fvwm-config
AC_SUBST(with_bidi)
AC_SUBST(with_gdkimlib)
AC_SUBST(with_gettext)
AC_SUBST(with_iconv)
AC_SUBST(with_perllib)
AC_SUBST(with_png)
AC_SUBST(with_rsvg)
AC_SUBST(with_readline)
AC_SUBST(with_shape)
AC_SUBST(with_shm)
AC_SUBST(with_sm)
AC_SUBST(with_xcursor)
AC_SUBST(with_xft)
AC_SUBST(with_xrandr)
AC_SUBST(with_xrender)
AC_SUBST(with_xpm)

dnl with autoconf <2.60 this is needed
AC_SUBST(datarootdir)
AC_SUBST(docdir)
Expand All @@ -1426,7 +1408,6 @@ dnl
bin/Makefile
bin/FvwmCommand
bin/FvwmPrompt/Makefile
bin/fvwm-config
bin/fvwm-perllib
bin/fvwm-menu-xlock
bin/fvwm-menu-directory
Expand Down
1 change: 0 additions & 1 deletion default-config/config
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ AddToMenu MenuFvwmManPages "Help" Title
+ "fvwm-menu-desktop" ViewManPage fvwm-menu-desktop
+ "fvwm-menu-directory" ViewManPage fvwm-menu-directory
+ "fvwm-menu-xlock" ViewManPage fvwm-menu-xlock
+ "fvwm-config" ViewManPage fvwm-config

#######
# 5: Mouse and Key bindings
Expand Down
96 changes: 0 additions & 96 deletions doc/fvwm-config.adoc

This file was deleted.

2 changes: 0 additions & 2 deletions doc/fvwm3_manpage_source.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9487,8 +9487,6 @@ _SM_SAVE_DIR_::
it uses _$HOME_. Note, the state files are named _.fs-??????_ and
normally are removed automatically when not used anymore.

*fvwm-config --info* is useful to query fvwm3 compiled-in paths

== AUTHORS

Robert Nation with help from many people, based on twm code, which was
Expand Down
2 changes: 1 addition & 1 deletion perllib/FVWM/Module.pm.in
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ Returns the user data directory, usually ~/.fvwm or set by $FVWM_USERDIR.
=item B<site_data_dir>

Returns the system-wide data directory, the one configured when fvwm is
installed. It is also returned by `fvwm-config --fvwm-datadir`.
installed.

=item B<search_dirs>

Expand Down