Skip to content

Commit eb90154

Browse files
committed
Update packaging files.
1 parent 587c587 commit eb90154

9 files changed

Lines changed: 279 additions & 1191 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The CUPS Library v3 (libcups)
1111
1212
The CUPS library (libcups) provides a common C API for HTTP/HTTPS and IPP
1313
communications on Unix®-like operating systems and Microsoft Windows®. It is
14-
used by many printing-related projects such as [CUPS][1] and [PAPPL][2]. This
15-
project is part of OpenPrinting's CUPS 3.0 development, which will provide a
16-
100% driverless printing system for Unix®-life operating systems.
14+
used by many printing-related projects such as [CUPS][CUPS] and [PAPPL][PAPPL].
15+
This project is part of OpenPrinting's CUPS 3.0 development, which will provide
16+
a 100% driverless printing system for Unix®-life operating systems.
1717

1818
This version of the CUPS library removes all of the deprecated and obsolete APIs
1919
from CUPS 2.x and earlier and is *not* binary compatible with older releases.
@@ -67,5 +67,5 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
6767
specific language governing permissions and limitations under the License.
6868

6969

70-
[1]: https://openprinting.github.io/cups
71-
[2]: https://www.msweet.org/pappl
70+
[CUPS]: https://openprinting.github.io/cups
71+
[PAPPL]: https://www.msweet.org/pappl

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5637,7 +5637,7 @@ PKGCONFIG_REQUIRES="$(echo $PKGCONFIG_REQUIRES | sed -e '1,$s/,$//')"
56375637
PKGCONFIG_REQUIRES_PRIVATE="$(echo $PKGCONFIG_REQUIRES_PRIVATE | sed -e '1,$s/,$//')"
56385638

56395639

5640-
ac_config_files="$ac_config_files Makedefs cups3.pc packaging/libcups.list"
5640+
ac_config_files="$ac_config_files Makedefs cups3.pc packaging/libcups3.list"
56415641

56425642
cat >confcache <<\_ACEOF
56435643
# This file is a shell script that caches the results of configure
@@ -6327,7 +6327,7 @@ do
63276327
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
63286328
"Makedefs") CONFIG_FILES="$CONFIG_FILES Makedefs" ;;
63296329
"cups3.pc") CONFIG_FILES="$CONFIG_FILES cups3.pc" ;;
6330-
"packaging/libcups.list") CONFIG_FILES="$CONFIG_FILES packaging/libcups.list" ;;
6330+
"packaging/libcups3.list") CONFIG_FILES="$CONFIG_FILES packaging/libcups3.list" ;;
63316331
63326332
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
63336333
esac

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,5 +654,5 @@ dnl Clean up pkg-config "requires" content...
654654

655655

656656
dnl Provide autoconf with a list of files to generate and output them...
657-
AC_CONFIG_FILES([Makedefs cups3.pc packaging/libcups.list])
657+
AC_CONFIG_FILES([Makedefs cups3.pc packaging/libcups3.list])
658658
AC_OUTPUT

doc/Makefile

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Documentation makefile for libcups.
33
#
4-
# Copyright © 2021-2022 by OpenPrinting.
4+
# Copyright © 2021-2023 by OpenPrinting.
55
#
66
# Licensed under Apache License v2.0. See the file "LICENSE" for more
77
# information.
@@ -19,12 +19,7 @@ DOCFILES = \
1919
ippevepcl.html \
2020
ippeveprinter.html \
2121
ipptool.html \
22-
ipptoolfile.html \
23-
raster-organization.png \
24-
raster.png \
25-
sample-image.png \
26-
spec-ipp.html \
27-
spec-raster.html
22+
ipptoolfile.html
2823

2924

3025
#
@@ -67,10 +62,10 @@ depend:
6762
#
6863

6964
install:
70-
echo "Installing documentation files to $(BUILDROOT)$(datadir)/doc/libcups..."
71-
$(INSTALL_DIR) $(BUILDROOT)$(datadir)/doc/libcups
65+
echo "Installing documentation files to $(BUILDROOT)$(datadir)/doc/libcups3..."
66+
$(INSTALL_DIR) $(BUILDROOT)$(datadir)/doc/libcups3
7267
for file in $(DOCFILES); do \
73-
$(INSTALL_MAN) $$file $(BUILDROOT)$(datadir)/doc/libcups; \
68+
$(INSTALL_MAN) $$file $(BUILDROOT)$(datadir)/doc/libcups3; \
7469
done
7570

7671

@@ -79,8 +74,8 @@ install:
7974
#
8075

8176
uninstall:
82-
echo "Uninstalling documentation files from $(BUILDROOT)$(datadir)/doc/libcups..."
77+
echo "Uninstalling documentation files from $(BUILDROOT)$(datadir)/doc/libcups3..."
8378
for file in $(DOCFILES); do \
84-
$(RM) $(BUILDROOT)$(datadir)/doc/libcups/$$file; \
79+
$(RM) $(BUILDROOT)$(datadir)/doc/libcups3/$$file; \
8580
done
86-
-$(RMDIR) $(BUILDROOT)$(datadir)/doc/libcups
81+
-$(RMDIR) $(BUILDROOT)$(datadir)/doc/libcups3

0 commit comments

Comments
 (0)