Skip to content

Commit b762ec5

Browse files
committed
Install data files to /usr/share/libcups3.
1 parent eb90154 commit b762ec5

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.git* export-ignore
22
.mailmap export-ignore
33
examples/testfile.pcl -text
4-
exampels/testfile.txt -text
4+
examples/testfile.txt -text
55
scripts export-ignore

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5570,9 +5570,9 @@ fi
55705570
fi
55715571

55725572

5573-
CUPS_DATADIR="$datadir/cups"
5573+
CUPS_DATADIR="$datadir/libcups3"
55745574

5575-
printf "%s\n" "#define CUPS_DATADIR \"$datadir/cups\"" >>confdefs.h
5575+
printf "%s\n" "#define CUPS_DATADIR \"$datadir/libcups3\"" >>confdefs.h
55765576

55775577

55785578

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,8 @@ AS_IF([test "$sysconfdir" = "\${prefix}/etc"], [
613613

614614

615615
dnl CUPS_DATADIR and CUPS_SERVERROOT
616-
CUPS_DATADIR="$datadir/cups"
617-
AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/cups"], [Location of data files.])
616+
CUPS_DATADIR="$datadir/libcups3"
617+
AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/libcups3"], [Location of data files.])
618618
AC_SUBST([CUPS_DATADIR])
619619

620620
CUPS_SERVERROOT="$sysconfdir/cups"

packaging/libcups3.spec.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ rm -rf $RPM_BUILD_ROOT
7676

7777
/usr/lib/libcups3.so.3
7878

79-
%dir /usr/share/cups
80-
%dir /usr/share/cups/ipptool
81-
/usr/share/cups/ipptool/*
79+
%dir /usr/share/libcups3
80+
%dir /usr/share/libcups3/ipptool
81+
/usr/share/libcups3/ipptool/*
8282

8383
%dir /usr/share/doc/libcups3
8484
/usr/share/doc/libcups3/ipp*.html

0 commit comments

Comments
 (0)